don't return wxFONTENCODING_DEFAULT from wxFont::GetEncoding(), this results in asserts when its return value is used with wxCSConv (and besides this should never happen anyhow, wxFONTENCODING_DEFAULT makes sense on input only)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-31 15:10:20 +00:00 · 2007-03-31 15:10:20 +00:00 · 295ebfd081
commit 295ebfd081
parent a95a6eb4aa
1 changed files with 2 additions and 0 deletions
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@ -157,6 +157,8 @@ void wxFontRefData::Init(int pointSize,

    m_underlined = underlined;
    m_encoding = encoding;
+    if ( m_encoding == wxFONTENCODING_DEFAULT )
+        m_encoding = wxFont::GetDefaultEncoding();

    m_noAA = false;