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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

23
interface/wx/font.h
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.

24
src/gtk/font.cpp
View File

@@ -93,7 +93,6 @@ protected:
void InitFromNative();
private:
wxFontEncoding m_encoding;
bool m_underlined;
bool m_noAA; // No anti-aliasing
@@ -115,16 +114,12 @@ void wxFontRefData::Init(int pointSize,
wxFontWeight weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
wxFontEncoding WXUNUSED(encoding))
{
if (family == wxFONTFAMILY_DEFAULT)
family = wxFONTFAMILY_SWISS;
m_underlined = underlined;
m_encoding = encoding;
if ( m_encoding == wxFONTENCODING_DEFAULT )
m_encoding = wxFont::GetDefaultEncoding();
m_noAA = false;
// Create native font info
@@ -133,7 +128,7 @@ void wxFontRefData::Init(int pointSize,
// And set its values
if (!faceName.empty())
{
pango_font_description_set_family( m_nativeFontInfo.description,
pango_font_description_set_family( m_nativeFontInfo.description,
wxGTK_CONV_SYS(faceName) );
}
else
@@ -162,16 +157,12 @@ void wxFontRefData::InitFromNative()
// Pango description are never underlined
m_underlined = false;
// always with GTK+ 2
m_encoding = wxFONTENCODING_UTF8;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
: wxGDIRefData()
{
m_underlined = data.m_underlined;
m_encoding = data.m_encoding;
m_noAA = data.m_noAA;
// Forces a copy of the internal data. wxNativeFontInfo should probably
@@ -267,13 +258,9 @@ bool wxFontRefData::SetFaceName(const wxString& facename)
return m_nativeFontInfo.SetFaceName(facename);
}
void wxFontRefData::SetEncoding(wxFontEncoding encoding)
void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
{
m_encoding = encoding;
// the internal Pango encoding is always UTF8; here we save the
// encoding just to make it possible to return it from GetEncoding()
// FIXME: this seems wrong; shouldn't GetEncoding() always return wxFONTENCODING_UTF8?
// with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
}
void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
@@ -386,7 +373,8 @@ wxFontEncoding wxFont::GetEncoding() const
{
wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
return M_FONTDATA->m_encoding;
return wxFONTENCODING_UTF8;
// Pango always uses UTF8... see also SetEncoding()
}
bool wxFont::GetNoAntiAliasing() const