Fixed a long-standing issue where wxSlider controls with a hardcoded size would mispl...

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index bffa169a38132b42559e9a026486a625e782b2d3..fefc22adb6e4dbf888bd25d2505b2e895b42fb95 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -45,8 +45,8 @@
 
 #include "wx/cmndata.h"
 #include "wx/log.h"
+#include "wx/math.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -66,7 +66,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
-    DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;
+    // It should be OK to always use GDI simulations
+    DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ;
 
     LOGFONT logFont;
 
@@ -87,9 +88,6 @@ int wxFontDialog::ShowModal()
     if ( m_fontData.m_fontColour.Ok() )
     {
         chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
-
-        // need this for the colour to be taken into account
-        flags |= CF_EFFECTS;
     }
 
     // CF_ANSIONLY flag is obsolete for Win32