part of the fix to the initial colour selection in the font picker dialog (the real...

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 c489e93c645a4bec6d94c866ab3a8f7a49ad7093..b15e0adcbd72b207927aa334ed1fed20715fb142 100644 (file)
--- 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() )