diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-01-09 11:53:10 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-01-09 11:53:10 +0000 |
| commit | 2e8d6d4d1a1695013ac12162635e47bad1985804 (patch) | |
| tree | 5691242cf3c2b0b10a6ab1c2a4b0a77a7d8e10f4 /scintilla/src | |
| parent | 974106173906487cd44778b88ad5e713d0b7354c (diff) | |
| download | notepad2-mod-2e8d6d4d1a1695013ac12162635e47bad1985804.zip notepad2-mod-2e8d6d4d1a1695013ac12162635e47bad1985804.tar.gz notepad2-mod-2e8d6d4d1a1695013ac12162635e47bad1985804.tar.bz2 | |
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@693 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src')
| -rw-r--r-- | scintilla/src/PositionCache.cxx | 4 | ||||
| -rw-r--r-- | scintilla/src/PositionCache.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx index 002dd85..b6f8144 100644 --- a/scintilla/src/PositionCache.cxx +++ b/scintilla/src/PositionCache.cxx @@ -189,10 +189,10 @@ void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[], bool xHighlightGuide = 0;
}
-int LineLayout::FindBefore(int x, int lower, int upper) const {
+int LineLayout::FindBefore(XYPOSITION x, int lower, int upper) const {
do {
int middle = (upper + lower + 1) / 2; // Round high
- int posMiddle = positions[middle];
+ XYPOSITION posMiddle = positions[middle];
if (x < posMiddle) {
upper = middle - 1;
} else {
diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h index 3330a7a..bb803d6 100644 --- a/scintilla/src/PositionCache.h +++ b/scintilla/src/PositionCache.h @@ -65,7 +65,7 @@ public: void SetBracesHighlight(Range rangeLine, Position braces[],
char bracesMatchStyle, int xHighlight, bool ignoreStyle);
void RestoreBracesHighlight(Range rangeLine, Position braces[], bool ignoreStyle);
- int FindBefore(int x, int lower, int upper) const;
+ int FindBefore(XYPOSITION x, int lower, int upper) const;
int EndLineStyle() const;
};
|