X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..bcd1ec333ac3ba7d36f2eed79fa52208b2514d84:/src/msw/fontdlg.cpp?ds=sidebyside diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index bffa169a38..fefc22adb6 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -45,8 +45,8 @@ #include "wx/cmndata.h" #include "wx/log.h" +#include "wx/math.h" -#include #include #include @@ -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,9 +88,6 @@ 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