fix warning

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index c11dfa737076ea853b22095a873c41cfab3ca78d..df30e1b671e6ee7ec9879437e57f047c1f8654f1 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -32,6 +32,9 @@
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 

+#undef wxFontDialog
+#include "wx/mac/fontdlg.h"
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -316,8 +319,8 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
                                 const wxString& encoding)
     {
         wxString text;

-        text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"),
-                    ++m_n, encoding.c_str(), facename.c_str());
+        text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"),
+                    (unsigned int) ++m_n, encoding.c_str(), facename.c_str());

         m_text += text;
         return true;
     }
         m_text += text;
         return true;
     }