From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 16 Mar 2007 16:40:12 +0000 (+0000)
Subject: wxX11 Unicode compilation fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/47239bd6b640fa4e4c82fc851696c5f5d9e2fa37

wxX11 Unicode compilation fix


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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 1a19014406..c0c8b07bf0 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -48,11 +48,13 @@
     extern GtkWidget *wxGetRootWindow();
 
     #define wxPANGO_CONV wxGTK_CONV_SYS
+    #define wxPANGO_CONV_BACK wxGTK_CONV_BACK_SYS
 #else
     #include "wx/x11/private.h"
     #include "wx/gtk/private/string.h"
 
     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
+    #define wxPANGO_CONV_BACK(s) (wxConvUTF8.cMB2WX((s)))
 #endif
 
 // ----------------------------------------------------------------------------
@@ -136,7 +138,7 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
-    return wxGTK_CONV_BACK_SYS(pango_font_description_get_family(description));
+    return wxPANGO_CONV_BACK(pango_font_description_get_family(description));
 }
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
@@ -325,7 +327,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxGtkString str(pango_font_description_to_string( description ));
 
-    return wxGTK_CONV_BACK_SYS(str);
+    return wxPANGO_CONV_BACK(str);
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)