Fix wxGrid editors background painting.

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index fefc22adb6e4dbf888bd25d2505b2e895b42fb95..96c3289a6d7c925c19aa2f0bda44ad54aaad4a37 100644 (file)
--- 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 <commdlg.h>
-#endif
-
-#include "wx/cmndata.h"
-#include "wx/log.h"
-#include "wx/math.h"
-
 #include <stdlib.h>
 #include <string.h>
 
@@ -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;
     }