don't return whatever encoding was set in SetEncoding(); always return wxFONTENCODING_UTF8 instead since that's the real encoding always used by wxFont under wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-04-14 23:18:50 +00:00
parent d9d551f6a2
commit 7ce58684a4
2 changed files with 28 additions and 19 deletions

View File

@@ -111,6 +111,8 @@ enum wxFontFlag
/**
Font encodings.
See wxFont::SetEncoding().
*/
enum wxFontEncoding
{
@@ -405,7 +407,16 @@ public:
@see @ref overview_fontencoding, SetDefaultEncoding()
*/
static wxFontEncoding GetDefaultEncoding();
/**
Returns the encoding of this font.
Note that under wxGTK the returned value is always @c wxFONTENCODING_UTF8.
@see SetEncoding()
*/
virtual wxFontEncoding GetEncoding() const;
/**
Returns the face name associated with the font, or the empty string if
there is no face information.
@@ -541,6 +552,16 @@ public:
@see @ref overview_fontencoding, GetDefaultEncoding()
*/
static void SetDefaultEncoding(wxFontEncoding encoding);
/**
Sets the encoding for this font.
Note that under wxGTK this function has no effect (because the underlying
Pango library always uses @c wxFONTENCODING_UTF8).
@see GetEncoding()
*/
virtual void SetEncoding(wxFontEncoding encoding);
/**
Sets the facename for the font.