#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
// 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 ))
InitFromNative();
}
+#ifndef __WXGTK20__
void wxFontRefData::ReInit(const wxString& fontname)
{
m_nativeFontInfo.SetXFontName(fontname);
InitFromNative();
}
+#endif
void wxFontRefData::ClearGdkFonts()
{
return M_FONTDATA->m_noAA;
}
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
GetInternalFont();
#endif
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
&xfontname);
if ( font )
{
- M_FONTDATA->m_nativeFontInfo.ReInit(xfontname);
+ M_FONTDATA->ReInit(xfontname);
}
}
}