fixed setting of initial font under wxGTK2

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 34ff09c2dd8267004c43fb3d1499e0602dca57da..bffa169a38132b42559e9a026486a625e782b2d3 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "fontdlg.h"
 #endif
 
     #pragma implementation "fontdlg.h"
 #endif
 


@@ -95,12 +95,8 @@ int wxFontDialog::ShowModal()
     // CF_ANSIONLY flag is obsolete for Win32
     if ( !m_fontData.GetAllowSymbols() )
     {
     // 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;
       flags |= CF_SELECTSCRIPT;
       logFont.lfCharSet = ANSI_CHARSET;

-#endif // Win16/32

     }
 
     if ( m_fontData.GetEnableEffects() )
     }
 
     if ( m_fontData.GetEnableEffects() )