X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5c4c31e6cdaea9afcc10b04e6fe37ec02e300a4..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/msw/control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index c3bd297ea4..01d09f4832 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
+// Name:        wx/msw/control.h
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -12,14 +12,10 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "control.h"
-#endif
-
 #include "wx/dynarray.h"
 
 // General item class
-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
 public:
     wxControl() { }
@@ -39,7 +35,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
-    virtual ~wxControl();
 
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
@@ -60,16 +55,21 @@ public:
     bool ProcessCommand(wxCommandEvent& event);
 
     // MSW-specific
-#ifdef __WIN95__
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-#endif // Win95
 
     // For ownerdraw items
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
-    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
+    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
+    // default handling of WM_CTLCOLORxxx: this is public so that wxWindow
+    // could call it
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
+
+    // default style for the control include WS_TABSTOP if it AcceptsFocus()
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
@@ -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.
-    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
@@ -113,40 +113,14 @@ protected:
                           const wxString& label = wxEmptyString,
                           WXDWORD exstyle = (WXDWORD)-1);
 
-    // 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
+    // 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 MSWControlColorSolid(pDC, GetBackgroundColour());
-    }
-
-    // common part of the 3 methods above
-    WXHBRUSH MSWControlColorSolid(WXHDC pDC, wxColour colBg);
-
-    // another WM_CTLCOLOR-related function: if it returns false, we return
-    // NULL_BRUSH from MSWControlColor() to prevent the system from erasing the
-    // background at all
-    //
-    // override this function to return true for controls which do want to
-    // draw their background themselves
-    virtual bool MSWAlwaysDrawBg() const { return false; }
-
-    // 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
-    // being simple controls (such as wxButton, wxCheckBox, ...)
-    static wxVisualAttributes
-        GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
+    // 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, WXHWND hWnd);
 
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls