Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backported GTK2 default font fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-04-08 22:28:30 +00:00
parent b28d567bb0
commit a0bcb6934e
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/settings.cpp
View File

@@ -328,8 +328,23 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ()); GtkWidget *widget = gtk_button_new();
g_systemFont = new wxFont( wxString::FromAscii( font_name ) ); GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
wxNativeFontInfo info;
info.description = def->font_desc;
g_systemFont = new wxFont(info);
}
else
{
const gchar *font_name =
_gtk_rc_context_get_default_font_name(gtk_settings_get_default());
g_systemFont = new wxFont(wxString::FromAscii(font_name));
}
gtk_widget_destroy( widget );
#else #else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif #endif

19
src/gtk1/settings.cpp
View File

@@ -328,8 +328,23 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ()); GtkWidget *widget = gtk_button_new();
g_systemFont = new wxFont( wxString::FromAscii( font_name ) ); GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
wxNativeFontInfo info;
info.description = def->font_desc;
g_systemFont = new wxFont(info);
}
else
{
const gchar *font_name =
_gtk_rc_context_get_default_font_name(gtk_settings_get_default());
g_systemFont = new wxFont(wxString::FromAscii(font_name));
}
gtk_widget_destroy( widget );
#else #else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif #endif