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

samples/stc/edit.cpp

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

src/stc/PlatWX.cpp

@@ -2140,7 +2140,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
     #ifdef __WXMSW__
 
         // Use ShowWithoutActivating instead of show.
-        bool wxSTCPopupBase::Show(bool show)
+        bool wxSTCPopupBase::Show(bool show) wxOVERRIDE
         {
             if ( show )
             {
@@ -2158,7 +2158,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
 
         // Do not activate in response to mouse clicks on this window.
         bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
-                                              WXWPARAM wParam, WXLPARAM lParam)
+                                              WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
         {
             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();
     itemCol = newColour;

src/stc/PlatWXcocoa.mm

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