From db0d7e67a9ea684990f9a3085d14eedfb0ed586e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Sep 2014 17:42:03 +0000
Subject: [PATCH] set enc to wxUnusedVar in unicode mode, remove the old ugly
 code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/x11/font.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index de5f9c6c0e..0c0deed637 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -563,13 +563,12 @@ bool wxFont::Create(int pointSize,
     return true;
 }
 
-bool wxFont::Create(const wxString& fontname,
-#if wxUSE_UNICODE
-                    wxFontEncoding WXUNUSED(enc))
-#else
-                    wxFontEncoding enc)
-#endif
+bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 {
+#if wxUSE_UNICODE
+    wxUnusedVar(enc);
+#endif
+
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);