Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed X11 Unicode build compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-19 15:25:59 +00:00
parent 479c790cb7
commit 29131e8a54
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/unix/fontutil.cpp
View File

@@ -46,8 +46,13 @@
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
extern GtkWidget *wxGetRootWindow(); extern GtkWidget *wxGetRootWindow();
#define wxPANGO_CONV wxGTK_CONV_SYS
#else #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 #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -263,7 +268,7 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
bool wxNativeFontInfo::SetFaceName(const wxString& facename) 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; 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 // ensure a valid facename is selected
if (!wxFontEnumerator::IsValidFacename(GetFaceName())) if (!wxFontEnumerator::IsValidFacename(GetFaceName()))