Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/stc/ScintillaWX.cpp
View File

@@ -103,9 +103,9 @@ public:
| wxFRAME_FLOAT_ON_PARENT | wxFRAME_FLOAT_ON_PARENT
| wxBORDER_NONE | wxBORDER_NONE
#ifdef __WXMAC__ #ifdef __WXMAC__
| wxPOPUP_WINDOW | wxPOPUP_WINDOW
#endif #endif
), ),
#endif #endif
m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord) m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
{ {
@@ -180,7 +180,7 @@ public:
return rv; return rv;
} }
#endif #endif
wxPoint GetMyPosition() wxPoint GetMyPosition()
{ {
return wxPoint(m_cx, m_cy); return wxPoint(m_cx, m_cy);
@@ -500,7 +500,7 @@ void ScintillaWX::Paste() {
#if wxUSE_UNICODE #if wxUSE_UNICODE
// free up the old character buffer in case the text is real big // free up the old character buffer in case the text is real big
data.SetText(wxEmptyString); data.SetText(wxEmptyString);
text = wxEmptyString; text = wxEmptyString;
#endif #endif
int len = strlen(buf); int len = strlen(buf);
@@ -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.