diff options
| author | nyamatongwe <unknown> | 2011-09-24 22:10:59 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-09-24 22:10:59 +1000 |
| commit | 77d25bd25490fe412a213581e371c7c26eb23f7d (patch) | |
| tree | e91d99a2328e82067e9781599cb2e058a8400fa3 /src/PositionCache.h | |
| parent | df08d45447c2b2386629d13004f4ab6006cab2d8 (diff) | |
| parent | 33e27dc25f933a92566d91a667ba4ee732ba6cfa (diff) | |
| download | scintilla-mirror-77d25bd25490fe412a213581e371c7c26eb23f7d.tar.gz | |
Merged fractional text positioning branch.
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) { |