From 29131e8a54a8bb08ce6ea0bdb0d4093c20aebf68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 19 Oct 2006 15:25:59 +0000 Subject: [PATCH] fixed X11 Unicode build compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index c3cc7702e5..3d09eb207c 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -44,10 +44,15 @@ #include "pango/pango.h" #ifdef __WXGTK20__ -#include "wx/gtk/private.h" -extern GtkWidget *wxGetRootWindow(); + #include "wx/gtk/private.h" + extern GtkWidget *wxGetRootWindow(); + + #define wxPANGO_CONV wxGTK_CONV_SYS #else -#include "wx/x11/private.h" + #include "wx/x11/private.h" + #include "wx/gtk/private/string.h" + + #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s))) #endif // ---------------------------------------------------------------------------- @@ -263,7 +268,7 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) bool wxNativeFontInfo::SetFaceName(const wxString& facename) { - pango_font_description_set_family(description, wxGTK_CONV_SYS(facename)); + pango_font_description_set_family(description, wxPANGO_CONV(facename)); return true; } @@ -309,7 +314,7 @@ bool wxNativeFontInfo::FromString(const wxString& s) } } - description = pango_font_description_from_string( wxGTK_CONV_SYS( str ) ); + description = pango_font_description_from_string(wxPANGO_CONV(str)); // ensure a valid facename is selected if (!wxFontEnumerator::IsValidFacename(GetFaceName())) -- 2.45.2