diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | src/CallTip.cxx | 4 | ||||
| -rw-r--r-- | src/CallTip.h | 3 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 11 |
4 files changed, 11 insertions, 8 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index bcee196db..1bc22f3cc 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -176,6 +176,7 @@ <li>Herr Pfarrer</li> <li>Ben Key</li> <li>Gene Barry</li> + <li>Niki Spahiev</li> </ul> <p> Images used in GTK+ version diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 93e888d0e..003284c12 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -214,7 +214,7 @@ void CallTip::MouseClick(Point pt) { PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn, const char *faceName, int size, - int codePage_, Window &wParent) { + int codePage_, int characterSet, Window &wParent) { clickPlace = 0; if (val) delete []val; @@ -234,7 +234,7 @@ PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn, inCallTipMode = true; posStartCallTip = pos; int deviceHeight = surfaceMeasure->DeviceHeightFont(size); - font.Create(faceName, SC_CHARSET_DEFAULT, deviceHeight, false, false); + font.Create(faceName, characterSet, deviceHeight, false, false); // Look for multiple lines in the text // Only support \n here - simply means container must avoid \r! int numLines = 1; diff --git a/src/CallTip.h b/src/CallTip.h index ffaedb077..feff7ea0b 100644 --- a/src/CallTip.h +++ b/src/CallTip.h @@ -52,7 +52,8 @@ public: /// Setup the calltip and return a rectangle of the area required. PRectangle CallTipStart(int pos, Point pt, const char *defn, - const char *faceName, int size, int codePage_, Window &wParent); + const char *faceName, int size, int codePage_, + int characterSet, Window &wParent); void CallTipCancel(); diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 066569f1d..e67c03ac5 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -357,11 +357,12 @@ void ScintillaBase::CallTipShow(Point pt, const char *defn) { AutoCompleteCancel(); pt.y += vs.lineHeight; PRectangle rc = ct.CallTipStart(currentPos, pt, - defn, - vs.styles[STYLE_DEFAULT].fontName, - vs.styles[STYLE_DEFAULT].sizeZoomed, - CodePage(), - wMain); + defn, + vs.styles[STYLE_DEFAULT].fontName, + vs.styles[STYLE_DEFAULT].sizeZoomed, + CodePage(), + vs.styles[STYLE_DEFAULT].characterSet, + wMain); // If the call-tip window would be out of the client // space, adjust so it displays above the text. PRectangle rcClient = GetClientRectangle(); |