X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae500232a4e961a567a5fb375fcf4f4a23216bd2..c5d99d7b5c4afa4fba509d751937d5e6cb7b2703:/src/msw/fontdlg.cpp?ds=sidebyside

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 43f96242e8..a48a60a2ee 100644
--- 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
 
@@ -37,13 +37,12 @@
 #endif
 
 #include "wx/fontdlg.h"
+#include "wx/msw/private.h"
 
-#if !defined(__WIN32__) || defined(__SALFORDC__)
-#include <windows.h>
+#if !defined(__WIN32__) || defined(__WXWINCE__)
 #include <commdlg.h>
 #endif
 
-#include "wx/msw/private.h"
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
@@ -88,20 +87,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() )