missing commit

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index e0917d615976007107c27c5aa207cf0efee6ca57..f800b51c11389e6a3060d7ccd6d2ba8946dbee7d 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -26,19 +26,17 @@
 
 #if wxUSE_FONTDLG
 
 
 #if wxUSE_FONTDLG
 

+#include "wx/fontdlg.h"
+#include "wx/modalhook.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
+    #include "wx/msw/wrapcdlg.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/log.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"
-#include "wx/msw/wrapcdlg.h"
-
-#include "wx/cmndata.h"
-#include "wx/log.h"
-#include "wx/math.h"
-

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 


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

+    WX_HOOK_MODAL_DIALOG();
+

     // 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 */ ;
 


@@ -71,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);
     }


@@ -114,17 +114,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;
     }