projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing dangling includes
[wxWidgets.git]
/
src
/
msw
/
fontdlg.cpp
diff --git
a/src/msw/fontdlg.cpp
b/src/msw/fontdlg.cpp
index 43f96242e81649932269c09618462bfe4399afe1..51a5bd1b2b47fbb0bb9c409176424a75d8841191 100644
(file)
--- a/
src/msw/fontdlg.cpp
+++ b/
src/msw/fontdlg.cpp
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "fontdlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-30,24
+26,17
@@
#if wxUSE_FONTDLG
#if wxUSE_FONTDLG
+#include "wx/fontdlg.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/
defs
.h"
+ #include "wx/
msw/wrapcdlg
.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/utils.h"
#include "wx/dialog.h"
+ #include "wx/log.h"
+ #include "wx/cmndata.h"
+ #include "wx/math.h"
#endif
#endif
-#include "wx/fontdlg.h"
-
-#if !defined(__WIN32__) || defined(__SALFORDC__)
-#include <windows.h>
-#include <commdlg.h>
-#endif
-
-#include "wx/msw/private.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
-
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-67,7
+56,8
@@
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
int wxFontDialog::ShowModal()
{
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;
LOGFONT logFont;
@@
-88,20
+78,13
@@
int wxFontDialog::ShowModal()
if ( m_fontData.m_fontColour.Ok() )
{
chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
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() )
{
}
// 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() )