Applied #10799: using CallTipUseStyle() doesn't enable wxSTC_STYLE_CALLTIP

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 13:17:14 +00:00
parent c50e0cc752
commit 2d512c47df

View File

@@ -674,12 +674,17 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
char* defn = reinterpret_cast<char *>(lParam); char* defn = reinterpret_cast<char *>(lParam);
AutoCompleteCancel(); AutoCompleteCancel();
pt.y += vs.lineHeight; pt.y += vs.lineHeight;
int ctStyle = ct.UseStyleCallTip() ? STYLE_CALLTIP : STYLE_DEFAULT;
if (ct.UseStyleCallTip())
{
ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
}
PRectangle rc = ct.CallTipStart(currentPos, pt, PRectangle rc = ct.CallTipStart(currentPos, pt,
defn, defn,
vs.styles[STYLE_DEFAULT].fontName, vs.styles[ctStyle].fontName,
vs.styles[STYLE_DEFAULT].sizeZoomed, vs.styles[ctStyle].sizeZoomed,
CodePage(), CodePage(),
vs.styles[STYLE_DEFAULT].characterSet, vs.styles[ctStyle].characterSet,
wMain); wMain);
// If the call-tip window would be out of the client // If the call-tip window would be out of the client
// space, adjust so it displays above the text. // space, adjust so it displays above the text.