Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returne...

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index eef97f198b6735ff8e99a500af5868ee8cf8e371..560d5f67c88e216fe110b361b356afabc4069486 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -241,6 +241,11 @@ void wxFontRefData::InitFromNative()
     // init fields
     m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
 
+    // Pango sometimes needs to have a size
+    int pango_size = pango_font_description_get_size( desc );
+    if (pango_size == 0)
+        pango_font_description_set_size( desc, 12 * PANGO_SCALE);
+        
     m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
 
     switch (pango_font_description_get_style( desc ))
@@ -443,13 +448,22 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
 }
 
 #ifndef __WXGTK20__
+
 void wxFontRefData::ReInit(const wxString& fontname)
 {
+    // calling InitFromNative() resets m_underlined flag as X11 fonts are never
+    // underlined, but we don't want to lose its old value here so save it ...
+    bool underlined = m_underlined;
+
     m_nativeFontInfo.SetXFontName(fontname);
 
     InitFromNative();
+
+    // ... and restore it now
+    m_underlined = underlined;
 }
-#endif
+
+#endif // !__WXGTK20__
 
 void wxFontRefData::ClearGdkFonts()
 {