fix warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,6 +32,9 @@
|
|||||||
#include "wx/splitter.h"
|
#include "wx/splitter.h"
|
||||||
#include "wx/textfile.h"
|
#include "wx/textfile.h"
|
||||||
|
|
||||||
|
#undef wxFontDialog
|
||||||
|
#include "wx/mac/fontdlg.h"
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// private classes
|
// private classes
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -316,8 +319,8 @@ protected:
|
|||||||
const wxString& encoding)
|
const wxString& encoding)
|
||||||
{
|
{
|
||||||
wxString text;
|
wxString text;
|
||||||
text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"),
|
text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"),
|
||||||
++m_n, encoding.c_str(), facename.c_str());
|
(unsigned int) ++m_n, encoding.c_str(), facename.c_str());
|
||||||
m_text += text;
|
m_text += text;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user