removed (well, kept empty shell to avoid breaking existing code) InheritAttributes()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/control.h b/include/wx/control.h
index bcfe71a48fee5e71c19b9da45053aab17cc195a6..ecde84ec8fb93b16de7c267806faad18be5760ff 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -74,8 +74,9 @@ protected:
                        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;

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 9c9714914b5eaebde7163889f9e7858f9059ef51..b46c4f8f8da1f3427ebae4f60e1fd0e27679edb6 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -89,20 +89,6 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
     return TRUE;
 }
 
-// inherit colour and font settings from the parent window
-void wxControlBase::InheritAttributes()
-{
-    if ( ShouldInheritColours() )
-    {
-        wxWindow *parent = GetParent();
-
-        wxCHECK_RET( parent, _T("a control without parent?") );
-
-        SetBackgroundColour(parent->GetBackgroundColour());
-        SetForegroundColour(parent->GetForegroundColour());
-    }
-}
-
 void wxControlBase::Command(wxCommandEvent& event)
 {
     (void)GetEventHandler()->ProcessEvent(event);