ignore clicks on a toolbar but outside any button

[wxWidgets.git] / src / msw / fontdlg.cpp

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 75acaeeea323ac3d4ad90667696d2c37f9aaf359..b15e0adcbd72b207927aa334ed1fed20715fb142 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.cpp
+// Name:        src/msw/fontdlg.cpp
 // Purpose:     wxFontDialog class
 // Author:      Julian Smart
 // Modified by:
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_FONTDLG
+
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/utils.h"
@@ -52,7 +54,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 // ============================================================================
 // implementation
@@ -103,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() )
@@ -156,3 +164,5 @@ int wxFontDialog::ShowModal()
         return wxID_CANCEL;
     }
 }
+
+#endif // wxUSE_FONTDLG