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 5862700b8be0bf604aa23e79b11ac07a709fff7c..ab32c80c7638b161319e97ba7cb5b9dcc710fe4e 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -70,9 +70,6 @@ public:
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-

 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;


@@ -84,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


@@ -119,6 +116,34 @@ protected:
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+    // default handling of WM_CTLCOLORxxx
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC);
+
+    // call this from the derived class MSWControlColor() if you want to show
+    // the control greyed out (and opaque)
+    WXHBRUSH MSWControlColorDisabled(WXHDC pDC);
+
+    // call this from the derived class MSWControlColor() if you want to always
+    // paint the background (as all opaque controls do)
+    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
+    //
+    // for most controls, the default behaviour of returning 0 and letting the
+    // system do it is correct, but for some -- e.g. checkboxes -- we actually
+    // have to return transparent brush from here to prevent the system from
+    // overwriting background with solid colour
+    virtual WXHBRUSH MSWGetDefaultBgBrush() { return 0; }
+

     // this is a helper for the derived class GetClassDefaultAttributes()
     // implementation: it returns the right colours for the classes which
     // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of
     // this is a helper for the derived class GetClassDefaultAttributes()
     // implementation: it returns the right colours for the classes which
     // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of