X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e80ff3d31fde40c3cef5a3b47d08850d95b5d1a..96c9640205933ad0673d5af2c96af0816c50160c:/src/msw/fontdlg.cpp?ds=inline diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 5564303799..96c3289a6d 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,16 @@ #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/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 @@ -79,13 +68,13 @@ int wxFontDialog::ShowModal() 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); } @@ -122,17 +111,12 @@ int wxFontDialog::ShowModal() } 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; }