From 14df3528d43361a7e9a8c0019dc505ef59bd1374 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 11 Dec 2003 09:10:03 +0000 Subject: [PATCH] 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 --- src/msw/dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 214bfb1dd4..8989db416b 100644 --- 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; }