From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 31 Mar 2007 15:10:20 +0000 (+0000)
Subject: don't return wxFONTENCODING_DEFAULT from wxFont::GetEncoding(), this results in asser... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/295ebfd08189c343f85b42d7bae566b404cc1fd6

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 11e7b20c64..94cc8e66d5 100644
--- 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;