aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ScintillaBase.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
committernyamatongwe <devnull@localhost>2011-09-09 16:59:38 +1000
commite00160f45844f28985e11540aa62a96a2fcb0146 (patch)
tree4f4c1f6692ed01d6f6c4f5361935a07328158131 /src/ScintillaBase.cxx
parentec3e2ca261c8a98fd0786c151a737ad12ed637f4 (diff)
parent8ab9f0c333bb0c9ef944d91d940c516b65b0384e (diff)
downloadscintilla-mirror-e00160f45844f28985e11540aa62a96a2fcb0146.tar.gz
Merge with main repository.
Diffstat (limited to 'src/ScintillaBase.cxx')
-rw-r--r--src/ScintillaBase.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index da6b03e0d..247f34c4e 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -222,7 +222,7 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
}
}
ac.Start(wMain, idAutoComplete, sel.MainCaret(), PointMainCaret(),
- lenEntered, vs.lineHeight, IsUnicodeMode());
+ lenEntered, vs.lineHeight, IsUnicodeMode(), technology);
PRectangle rcClient = GetClientRectangle();
Point pt = LocationFromPosition(sel.MainCaret() - lenEntered);
@@ -419,6 +419,7 @@ void ScintillaBase::CallTipShow(Point pt, const char *defn) {
vs.styles[ctStyle].sizeZoomed,
CodePage(),
vs.styles[ctStyle].characterSet,
+ vs.technology,
wMain);
// If the call-tip window would be out of the client
// space, adjust so it displays above the text.