From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 11 Dec 2003 09:10:03 +0000 (+0000)
Subject: Applied patch [ 816023 ] wxDialog overrides font setting
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6f951810a1005e1388b0ae80cb8a64570c4f1a47?ds=inline

Applied patch [ 816023 ] wxDialog overrides font setting


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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 94cf00190a..8ec0087a81 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -198,8 +198,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;
 }