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

wxX11 Unicode compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-16 16:40:12 +00:00
parent 72fa3e8a21
commit 47239bd6b6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/fontutil.cpp
View File

@@ -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)