diff options
| author | nyamatongwe <devnull@localhost> | 2011-09-09 16:59:38 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-09-09 16:59:38 +1000 |
| commit | e00160f45844f28985e11540aa62a96a2fcb0146 (patch) | |
| tree | 4f4c1f6692ed01d6f6c4f5361935a07328158131 /src/PositionCache.h | |
| parent | ec3e2ca261c8a98fd0786c151a737ad12ed637f4 (diff) | |
| parent | 8ab9f0c333bb0c9ef944d91d940c516b65b0384e (diff) | |
| download | scintilla-mirror-e00160f45844f28985e11540aa62a96a2fcb0146.tar.gz | |
Merge with main repository.
Diffstat (limited to 'src/PositionCache.h')
| -rw-r--r-- | src/PositionCache.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PositionCache.h b/src/PositionCache.h index c6076ea20..280446627 100644 --- a/src/PositionCache.h +++ b/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) { |