Ensure there is valid context for DrawRectangle

[wxWidgets.git] / src / msw / fontdlg.cpp

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index bc0ecc8a38953d973d0b426d1968b4e452ec1f9a..848dd4f5143e08b4040e36148b393d18c7273e63 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -27,6 +27,7 @@
 #if wxUSE_FONTDLG
 
 #include "wx/fontdlg.h"
 #if wxUSE_FONTDLG
 
 #include "wx/fontdlg.h"

+#include "wx/testing.h"

 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"


@@ -55,6 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

+    WX_TESTING_SHOW_MODAL_HOOK();
+

     // It should be OK to always use GDI simulations
     DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ;
 
     // 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;
 
         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);
     }
 
     {
         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);
     }
     {
         chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
     }