update Scintilla

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@576 28bd50df-7adb-d945-0439-6e466c6a13cc

1 files changed, 5 insertions, 5 deletions

diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
index 13436cb..3330a7a 100644
--- a/scintilla/src/PositionCache.h
+++ b/scintilla/src/PositionCache.h
@@ -41,7 +41,7 @@ public:
 	unsigned char *styles;

 	int styleBitsSet;

 	char *indicators;

-	int *positions;

+	XYPOSITION *positions;

 	char bracePreviousStyles[2];

 

 	// Hotspot support

@@ -103,13 +103,13 @@ class PositionCacheEntry {
 	unsigned int styleNumber:8;

 	unsigned int len:8;

 	unsigned int clock:16;

-	short *positions;

+	XYPOSITION *positions;

 public:

 	PositionCacheEntry();

 	~PositionCacheEntry();

-	void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, int *positions_, unsigned int clock);

+	void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_, unsigned int clock);

 	void Clear();

-	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, int *positions_) const;

+	bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_) const;

 	static int Hash(unsigned int styleNumber_, const char *s, unsigned int len);

 	bool NewerThan(const PositionCacheEntry &other) const;

 	void ResetClock();

@@ -155,7 +155,7 @@ public:
 	void SetSize(size_t size_);

 	size_t GetSize() const { return size; }

 	void MeasureWidths(Surface *surface, ViewStyle &vstyle, unsigned int styleNumber,

-		const char *s, unsigned int len, int *positions, Document *pdoc);

+		const char *s, unsigned int len, XYPOSITION *positions, Document *pdoc);

 };

 

 inline bool IsSpaceOrTab(int ch) {