// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// 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"
#if wxUSE_FONTDLG
+#include "wx/fontdlg.h"
+#include "wx/modalhook.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/math.h"
#endif
-#include "wx/fontdlg.h"
-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-#include <commdlg.h>
-#endif
-
-#include "wx/cmndata.h"
-#include "wx/log.h"
-
-#include <math.h>
#include <stdlib.h>
#include <string.h>
int wxFontDialog::ShowModal()
{
- DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;
+ WX_HOOK_MODAL_DIALOG();
+
+ // It should be OK to always use GDI simulations
+ DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ;
LOGFONT logFont;
chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
chooseFontStruct.lpLogFont = &logFont;
- if ( m_fontData.m_initialFont.Ok() )
+ if ( m_fontData.m_initialFont.IsOk() )
{
flags |= CF_INITTOLOGFONTSTRUCT;
wxFillLogFont(&logFont, &m_fontData.m_initialFont);
}
- if ( m_fontData.m_fontColour.Ok() )
+ if ( m_fontData.m_fontColour.IsOk() )
{
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
}
else
{
- // common dialog failed - why?
-#ifdef __WXDEBUG__
DWORD dwErr = CommDlgExtendedError();
if ( dwErr != 0 )
{
- // this msg is only for developers
- wxLogError(wxT("Common dialog failed with error code %0lx."),
- dwErr);
+ wxLogError(_("Common dialog failed with error code %0lx."), dwErr);
}
//else: it was just cancelled
-#endif
return wxID_CANCEL;
}