From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 23 Feb 2002 21:54:18 +0000 (+0000)
Subject: part of the fix to the initial colour selection in the font picker dialog (the real... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/951cf90dfbec7dd4fc6bd1c91dc6a16dde2f3fd4

part of the fix to the initial colour selection in the font picker dialog (the real fix was the change to wxColourToRGB() in msw/private.h)


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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index c489e93c64..b15e0adcbd 100644
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -105,7 +105,13 @@ int wxFontDialog::ShowModal()
         wxFillLogFont(&logFont, &m_fontData.initialFont);
     }
 
-    chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
+    if ( m_fontData.fontColour.Ok() )
+    {
+        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
+
+        // need this for the colour to be taken into account
+        flags |= CF_EFFECTS;
+    }
 
     // CF_ANSIONLY flag is obsolete for Win32
     if ( !m_fontData.GetAllowSymbols() )