Applied patch [ 816023 ] wxDialog overrides font setting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 09:10:03 +00:00
parent 31679bc6aa
commit 14df3528d4
1 changed files with 2 additions and 2 deletions
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -121,8 +121,8 @@ bool wxDialog::Create(wxWindow *parent,

    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
        return FALSE;
-
-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    if (!m_hasFont)
+        SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

    return TRUE;
 }