X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..6ed16512ddcd12ce46157ae32ecd96240ed3737e:/src/msw/fontdlg.cpp

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 75fcd09d38..fefc22adb6 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,17 +37,16 @@
 #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"
+#include "wx/math.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -67,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;
 
@@ -79,29 +79,22 @@ int wxFontDialog::ShowModal()
         chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
     chooseFontStruct.lpLogFont = &logFont;
 
-    if ( m_fontData.initialFont.Ok() )
+    if ( m_fontData.m_initialFont.Ok() )
     {
         flags |= CF_INITTOLOGFONTSTRUCT;
-        wxFillLogFont(&logFont, &m_fontData.initialFont);
+        wxFillLogFont(&logFont, &m_fontData.m_initialFont);
     }
 
-    if ( m_fontData.fontColour.Ok() )
+    if ( m_fontData.m_fontColour.Ok() )
     {
-        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
-
-        // need this for the colour to be taken into account
-        flags |= CF_EFFECTS;
+        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
     }
 
     // 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() )
@@ -109,10 +102,10 @@ int wxFontDialog::ShowModal()
     if ( m_fontData.GetShowHelp() )
       flags |= CF_SHOWHELP;
 
-    if ( m_fontData.minSize != 0 || m_fontData.maxSize != 0 )
+    if ( m_fontData.m_minSize != 0 || m_fontData.m_maxSize != 0 )
     {
-        chooseFontStruct.nSizeMin = m_fontData.minSize;
-        chooseFontStruct.nSizeMax = m_fontData.maxSize;
+        chooseFontStruct.nSizeMin = m_fontData.m_minSize;
+        chooseFontStruct.nSizeMax = m_fontData.m_maxSize;
         flags |= CF_LIMITSIZE;
     }
 
@@ -120,8 +113,8 @@ int wxFontDialog::ShowModal()
 
     if ( ChooseFont(&chooseFontStruct) != 0 )
     {
-        wxRGBToColour(m_fontData.fontColour, chooseFontStruct.rgbColors);
-        m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
+        wxRGBToColour(m_fontData.m_fontColour, chooseFontStruct.rgbColors);
+        m_fontData.m_chosenFont = wxCreateFontFromLogFont(&logFont);
         m_fontData.EncodingInfo().facename = logFont.lfFaceName;
         m_fontData.EncodingInfo().charset = logFont.lfCharSet;