Fix assert when creating wxBitmapButton without a valid bitmap in wxMSW.

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 51a5bd1b2b47fbb0bb9c409176424a75d8841191..96c3289a6d7c925c19aa2f0bda44ad54aaad4a37 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -33,7 +33,6 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"

-    #include "wx/cmndata.h"

     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 


@@ -69,13 +68,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);
     }


@@ -112,17 +111,12 @@ int wxFontDialog::ShowModal()
     }
     else
     {
     }
     else
     {

-        // common dialog failed - why?
-#ifdef __WXDEBUG__

         DWORD dwErr = CommDlgExtendedError();
         if ( dwErr != 0 )
         {
         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
         }
         //else: it was just cancelled

-#endif

 
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }