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

Lots of Pango etc up-ports from HEAD.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-02-11 11:35:15 +00:00
parent 7cc3aa347b
commit adb5f43a58
22 changed files with 447 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/fontutil.cpp
View File

@@ -132,26 +132,30 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
return wxFONTENCODING_SYSTEM;
}
bool wxNativeFontInfo::FromString(const wxString& s)
bool wxNativeFontInfo::FromString( const wxString& str )
{
if (description)
pango_font_description_free( description );
description = pango_font_description_from_string( wxGTK_CONV( s ) );
description = pango_font_description_from_string( wxGTK_CONV( str ) );
// wxPrintf( L"FromString result: %s\n", ToString().c_str() );
return TRUE;
}
wxString wxNativeFontInfo::ToString() const
{
wxString tmp = wxGTK_CONV_BACK( pango_font_description_to_string( description ) );
char *str = pango_font_description_to_string( description );
wxString tmp = wxGTK_CONV_BACK( str );
g_free( str );
return tmp;
}
bool wxNativeFontInfo::FromUserString(const wxString& s)
bool wxNativeFontInfo::FromUserString( const wxString& str )
{
return FromString( s );
return FromString( str );
}
wxString wxNativeFontInfo::ToUserString() const