Fix for assert after left click on tree in generic dir dialog in native MSW build...

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

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 9ba8a0c3a75316fcdd65070fac0c4fb210c7d45a..574d84a74b1dfa94307ad9f58faa6319ee24d88e 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "control.h"
 #endif
 
     #pragma interface "control.h"
 #endif
 


@@ -22,7 +22,8 @@
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 public:
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 public:

-    wxControl();
+    wxControl() { }
+

     wxControl(wxWindow *parent, wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,
     wxControl(wxWindow *parent, wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,


@@ -43,9 +44,18 @@ public:
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
 

+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // Calls the callback and appropriate event handlers
     bool ProcessCommand(wxCommandEvent& event);
 
     // Calls the callback and appropriate event handlers
     bool ProcessCommand(wxCommandEvent& event);
 


@@ -55,32 +65,24 @@ public:
 #endif // Win95
 
     // For ownerdraw items
 #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; };

 
 

-    wxArrayLong GetSubcontrols() { return m_subControls; }
-
-    void OnEraseBackground(wxEraseEvent& event);
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-#if WXWIN_COMPATIBILITY
-    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-    wxColour* GetButtonColour() const { return NULL; }
-
-    virtual void SetLabelFont(const wxFont& font);
-    virtual void SetButtonFont(const wxFont& font);
-    wxFont& GetLabelFont() const;
-    wxFont& GetButtonFont() const;
-#endif // WXWIN_COMPATIBILITY
+    const wxArrayLong& GetSubcontrols() const { return m_subControls; }

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

+    // return default best size (doesn't really make any sense, override this)

     virtual wxSize DoGetBestSize() const;
 
     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 GetBestSpinerSize(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
     // 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


@@ -96,8 +98,8 @@ protected:
     //     implement MSWGetStyle() this version will disappear.
     //
     // create the control of the given class with the given style (combination
     //     implement MSWGetStyle() this version will disappear.
     //
     // create the control of the given class with the given style (combination

-    // of WS_XXX flags, i.e. Windows style, not wxWindows one), returns
-    // FALSE if creation failed
+    // of WS_XXX flags, i.e. Windows style, not wxWidgets one), returns
+    // 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()
     //
     // All parameters except classname and style are optional, if the
     // size/position are not given, they should be set later with SetSize()


@@ -114,22 +116,36 @@ 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
+    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);
+
+    // 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);
+

     // 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)
     // 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()

 };
 
 };
 

-
-#if WXWIN_COMPATIBILITY
-    inline wxFont& wxControl::GetLabelFont() const { return (wxFont &)GetFont(); }
-    inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)GetFont(); }
-    inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
-    inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
-#endif // WXWIN_COMPATIBILITY
-
-#endif
-    // _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_