// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "fontdlg.h"
#endif
#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"
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() )