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 a7fed7decaddf22d3bfff7e46b64847dcd939ece..560d5f67c88e216fe110b361b356afabc4069486 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -86,8 +86,10 @@ public:
 #endif // GTK 2.0/1.x
     }
 
+#ifndef __WXGTK20__
     // reinitilize the font with the gived XFLD
     void ReInit(const wxString& fontname);
+#endif
 
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
@@ -239,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 ))
@@ -440,13 +447,24 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
+#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 // !__WXGTK20__
+
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
@@ -786,7 +804,7 @@ bool wxFont::GetNoAntiAliasing()
     return M_FONTDATA->m_noAA;
 }
 
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
@@ -795,7 +813,7 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const
         GetInternalFont();
 #endif
 
-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 bool wxFont::IsFixedWidth() const