on xcode native we end up with several definitions otherwise

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 00be04211e89eb9c5ba66894a0d8995140da7fb4..62ea97b1b357308d88982341a5e606e5d4bbcf3e 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -47,13 +47,22 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxControlNameStr);
 
+    // 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; }
+
+
+    // 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);
 
-    // get the control alignment (left/right/centre, top/bottom/centre)
-    int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
-
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
@@ -65,9 +74,6 @@ protected:
                        const wxValidator& validator,
                        const wxString& name);
 
-    // inherit colour and font settings from the parent window
-    void InheritAttributes();
-
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;