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

Merge branch 'stcpopup' of https://github.com/NewPagodi/wxWidgets into stcpopup

Browse Source
This commit is contained in:
New Pagodi
2019-04-19 10:12:29 -05:00
parent 9e2089e702 a5a44e8bae
commit 9fc8642458
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/stc/edit.cpp
View File

@@ -190,7 +190,7 @@ Edit::Edit (wxWindow *parent, wxWindowID id,
wxBitmap bmp(hashtag_xpm); wxBitmap bmp(hashtag_xpm);
RegisterImage(0, bmp); RegisterImage(0, bmp);
//call tips // call tips
CallTipSetBackground(*wxYELLOW); CallTipSetBackground(*wxYELLOW);
m_calltipNo = 1; m_calltipNo = 1;

6
src/stc/PlatWX.cpp
View File

@@ -2140,7 +2140,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
#ifdef __WXMSW__ #ifdef __WXMSW__
// Use ShowWithoutActivating instead of show. // Use ShowWithoutActivating instead of show.
bool wxSTCPopupBase::Show(bool show) bool wxSTCPopupBase::Show(bool show) wxOVERRIDE
{ {
if ( show ) if ( show )
{ {
@@ -2158,7 +2158,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
// Do not activate in response to mouse clicks on this window. // Do not activate in response to mouse clicks on this window.
bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg, bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
WXWPARAM wParam, WXLPARAM lParam) WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
{ {
if ( msg == WM_MOUSEACTIVATE ) if ( msg == WM_MOUSEACTIVATE )
{ {
@@ -2485,7 +2485,7 @@ void wxSTCListBoxVisualData::ComputeColours()
} }
} }
void SetColourHelper(bool& isSet, wxColour& itemCol, const wxColour& newColour) static void SetColourHelper(bool& isSet, wxColour& itemCol, const wxColour& newColour)
{ {
isSet = newColour.IsOk(); isSet = newColour.IsOk();
itemCol = newColour; itemCol = newColour;

2
src/stc/PlatWXcocoa.mm
View File

@@ -23,7 +23,7 @@
wxWindow* m_wxWin; wxWindow* m_wxWin;
} }
- (id)initWithwxWin:(wxWindow*) wxwin; - (id)initWithwxWin:(wxWindow*) wxWin;
@end @end