concentrating content and structure region calculations

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index eef97f198b6735ff8e99a500af5868ee8cf8e371..3989eea3bfcdd2e2a55b5609179426eb36ba7d74 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -86,11 +86,6 @@ public:
 #endif // GTK 2.0/1.x
     }
 
 #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
     void SetPointSize(int pointSize);
     // 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
     void SetPointSize(int pointSize);


@@ -241,6 +236,11 @@ void wxFontRefData::InitFromNative()
     // init fields
     m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
 
     // 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 ))
     m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
 
     switch (pango_font_description_get_style( desc ))


@@ -442,15 +442,6 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
     InitFromNative();
 }
 

-#ifndef __WXGTK20__
-void wxFontRefData::ReInit(const wxString& fontname)
-{
-    m_nativeFontInfo.SetXFontName(fontname);
-
-    InitFromNative();
-}
-#endif
-

 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__


@@ -964,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);

-                if ( font )
-                {
-                    M_FONTDATA->ReInit(xfontname);
-                }

             }
         }
 
             }
         }