X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/fontdlg.cpp diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index ee3382628c..51a5bd1b2b 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "fontdlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,23 +26,17 @@ #if wxUSE_FONTDLG +#include "wx/fontdlg.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" + #include "wx/msw/wrapcdlg.h" #include "wx/utils.h" #include "wx/dialog.h" + #include "wx/log.h" + #include "wx/cmndata.h" + #include "wx/math.h" #endif -#include "wx/fontdlg.h" -#include "wx/msw/private.h" - -#if !defined(__WIN32__) || defined(__WXWINCE__) -#include -#endif - -#include "wx/cmndata.h" -#include "wx/log.h" - -#include #include #include @@ -66,7 +56,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 +78,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() )