don't inherit font from the parent by default

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index ec97111188ae4c169cf3eaea1a9bdae455c3ad49..9c9714914b5eaebde7163889f9e7858f9059ef51 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -101,15 +101,6 @@ void wxControlBase::InheritAttributes()
         SetBackgroundColour(parent->GetBackgroundColour());
         SetForegroundColour(parent->GetForegroundColour());
     }
         SetBackgroundColour(parent->GetBackgroundColour());
         SetForegroundColour(parent->GetForegroundColour());
     }

-
-#ifdef __WXPM__
-    //
-    // All OS/2 ctrls use the small font
-    //
-    SetFont(*wxSMALL_FONT);
-#else
-    SetFont(GetParent()->GetFont());
-#endif

 }
 
 void wxControlBase::Command(wxCommandEvent& event)
 }
 
 void wxControlBase::Command(wxCommandEvent& event)