in unicode, we did not need the font encoding parameter

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:42:00 +00:00 · 2014-09-23 17:42:00 +00:00 · 08603120f4
commit 08603120f4
parent df00ba55e0
1 changed files with 6 additions and 1 deletions
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@ -563,7 +563,12 @@ bool wxFont::Create(int pointSize,
    return true;
 }

-bool wxFont::Create(const wxString& fontname, wxFontEncoding WXUNUSED(enc))
+bool wxFont::Create(const wxString& fontname,
+#if wxUSE_UNICODE
+                    wxFontEncoding WXUNUSED(enc))
+#else
+                    wxFontEncoding enc)
+#endif
 {
    if( !fontname )
    {