Compilation fix for VC++ 5 and 6

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 24dd2a7ab70dedb7f278755975520c09a6d2ab8e..f220821fbbe3e301cb89d429dcec2d3e1ac6ab48 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -65,15 +65,14 @@ public:
 #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; }
 
-    void OnEraseBackground(wxEraseEvent& event);
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    // default handling of WM_CTLCOLORxxx: this is public so that wxWindow
+    // could call it
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
 
 protected:
     // choose the default border for this window
@@ -82,6 +81,12 @@ protected:
     // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
 
+    // This is a helper for all wxControls made with UPDOWN native control.
+    // 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 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
     // size parameter (style parameter is not needed because m_windowStyle is
@@ -98,7 +103,7 @@ protected:
     //
     // create the control of the given class with the given style (combination
     // of WS_XXX flags, i.e. Windows style, not wxWidgets one), returns
-    // FALSE if creation failed
+    // false if creation failed
     //
     // All parameters except classname and style are optional, if the
     // size/position are not given, they should be set later with SetSize()
@@ -115,6 +120,15 @@ protected:
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+    // call this from the derived class MSWControlColor() if you want to show
+    // the control greyed out (and opaque)
+    WXHBRUSH MSWControlColorDisabled(WXHDC pDC);
+
+    // 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);
+
     // 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
@@ -122,15 +136,12 @@ protected:
     static wxVisualAttributes
         GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
 
-
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
-    DECLARE_EVENT_TABLE()
 };
 
-#endif
-    // _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_