wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

[wxWidgets.git] / include / wx / msw / control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 74000ed3e2d43f350d5e7703bdf7567e13788354..ab32c80c7638b161319e97ba7cb5b9dcc710fe4e 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -81,7 +81,7 @@ protected:
     // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
     // WinCE of Smartphones this happens also for native wxTextCtrl,
     // wxChoice and others.
     // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
     // WinCE of Smartphones this happens also for native wxTextCtrl,
     // wxChoice and others.

-    virtual wxSize GetBestSpinerSize(const bool is_vertical) const;
+    virtual wxSize GetBestSpinnerSize(const bool is_vertical) const;

 
     // create the control of the given Windows class: this is typically called
     // from Create() method of the derived class passing its label, pos and
 
     // create the control of the given Windows class: this is typically called
     // from Create() method of the derived class passing its label, pos and


@@ -125,7 +125,15 @@ protected:
 
     // call this from the derived class MSWControlColor() if you want to always
     // paint the background (as all opaque controls do)
 
     // call this from the derived class MSWControlColor() if you want to always
     // paint the background (as all opaque controls do)

-    WXHBRUSH MSWControlColorSolid(WXHDC pDC, wxColour colBg = wxNullColour);
+    WXHBRUSH MSWControlColorSolid(WXHDC pDC)
+    {
+        return DoMSWControlColor(pDC, GetBackgroundColour());
+    }
+
+    // common part of the 3 functions above: pass wxNullColour to use the
+    // appropriate background colour (meaning ours or our parents) or a fixed
+    // one
+    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg);

 
     // another WM_CTLCOLOR-related function: override this to return the brush
     // which should be used to paint the control background by default
 
     // another WM_CTLCOLOR-related function: override this to return the brush
     // which should be used to paint the control background by default