Font fix for OS/2 common control creation

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 2ebabc1f0d715a92784f61936f894d6ba3ba5748..c13f4dcc0c33e4826567f3b8fc7fae21749f1036 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -100,7 +100,14 @@ void wxControlBase::InheritAttributes()
     SetForegroundColour(GetParent()->GetForegroundColour());
 #endif // 0
 
     SetForegroundColour(GetParent()->GetForegroundColour());
 #endif // 0
 

+#ifdef __WXPM__
+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+#else

     SetFont(GetParent()->GetFont());
     SetFont(GetParent()->GetFont());

+#endif

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