wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 012e5c5a32d5ad3fc0973ff55c192e4449d2a0c9..ecde84ec8fb93b16de7c267806faad18be5760ff 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -47,18 +47,22 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxControlNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxControlNameStr);
 

-    // simulates the event of given type (i.e. wxButton::Command() is just as
-    // if the button was clicked)
-    virtual void Command(wxCommandEvent &event);
-

     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 

+

     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override
     // ShouldInheritColours() to return false
     virtual bool ShouldInheritColours() const { return true; }
 
     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override
     // ShouldInheritColours() to return false
     virtual bool ShouldInheritColours() const { return true; }
 

+
+    // WARNING: this doesn't work for all controls nor all platforms!
+    //
+    // simulates the event of given type (i.e. wxButton::Command() is just as
+    // if the button was clicked)
+    virtual void Command(wxCommandEvent &event);
+

 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children


@@ -70,8 +74,9 @@ protected:
                        const wxValidator& validator,
                        const wxString& name);
 
                        const wxValidator& validator,
                        const wxString& name);
 

-    // inherit colour and font settings from the parent window
-    void InheritAttributes();
+    // this function is obsolete, it is only kept for backwards compatibility,
+    // do *not* use it
+    void InheritAttributes() { }

 
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;
 
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;