X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/081d8d96db3bfe4dc490a6244b17184366846738..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/fontdlg.cpp?ds=inline diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index bc0ecc8a38..848dd4f514 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -27,6 +27,7 @@ #if wxUSE_FONTDLG #include "wx/fontdlg.h" +#include "wx/testing.h" #ifndef WX_PRECOMP #include "wx/msw/wrapcdlg.h" @@ -55,6 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) int wxFontDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + // It should be OK to always use GDI simulations DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ; @@ -68,13 +71,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); }