font inheritance fixes (patch 983251)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-01 10:46:38 +00:00
parent 51a4142ce1
commit e0176dd9fb
5 changed files with 6 additions and 6 deletions
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -168,7 +168,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname,

    // set up fonts and colours
    InheritAttributes();
-    SetFont(GetDefaultAttributes().font);
+    if (!m_hasFont)
+        SetFont(GetDefaultAttributes().font);

    // set the size now if no initial size specified
    SetInitialBestSize(size);