Use the wx version of the wxDECLARE_EVENT_TABLE_ENTRY macro

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 72802a232f255f8cdc2e35a3f2feaf5ce00bd96b..86156c2f37529d3fc087f4b9fb59146c7bb89abd 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -29,6 +29,7 @@
 #include "wx/fontdlg.h"
 
 #ifndef WX_PRECOMP
 #include "wx/fontdlg.h"
 
 #ifndef WX_PRECOMP

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

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


@@ -36,8 +37,6 @@
     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 

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

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


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