fixed typo in last commit

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 34ff09c2dd8267004c43fb3d1499e0602dca57da..fefc22adb6e4dbf888bd25d2505b2e895b42fb95 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontdlg.h"
 #endif
 
@@ -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,20 +88,13 @@ 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
     if ( !m_fontData.GetAllowSymbols() )
     {
-#ifdef __WIN16__
-      flags |= CF_ANSIONLY;
-#else // Win32
       flags |= CF_SELECTSCRIPT;
       logFont.lfCharSet = ANSI_CHARSET;
-#endif // Win16/32
     }
 
     if ( m_fontData.GetEnableEffects() )