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

another warning fixed/hidden

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-04-06 13:40:16 +00:00
parent 476e5f73c1
commit 92f4ec38a5
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/settings.cpp
View File

@@ -233,9 +233,9 @@ wxFont wxSystemSettings::GetSystemFont( int index )
{ {
if (!g_systemFont) if (!g_systemFont)
{ {
#if 0
GdkFont *gdk_font = (GdkFont*) NULL; GdkFont *gdk_font = (GdkFont*) NULL;
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
#if 0
GtkStyle *def = gtk_rc_get_style( widget ); GtkStyle *def = gtk_rc_get_style( widget );
if (def) if (def)
gdk_font = def->font; gdk_font = def->font;
@@ -253,13 +253,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
wxFontData font_data; wxFontData font_data;
g_systemFont = new wxFont( font_string, font_data ); g_systemFont = new wxFont( font_string, font_data );
} }
else
#endif
{
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
}
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
#endif
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
} }
return *g_systemFont; return *g_systemFont;
} }

12
src/gtk1/settings.cpp
View File

@@ -233,9 +233,9 @@ wxFont wxSystemSettings::GetSystemFont( int index )
{ {
if (!g_systemFont) if (!g_systemFont)
{ {
#if 0
GdkFont *gdk_font = (GdkFont*) NULL; GdkFont *gdk_font = (GdkFont*) NULL;
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
#if 0
GtkStyle *def = gtk_rc_get_style( widget ); GtkStyle *def = gtk_rc_get_style( widget );
if (def) if (def)
gdk_font = def->font; gdk_font = def->font;
@@ -253,13 +253,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
wxFontData font_data; wxFontData font_data;
g_systemFont = new wxFont( font_string, font_data ); g_systemFont = new wxFont( font_string, font_data );
} }
else
#endif
{
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
}
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
#endif
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
} }
return *g_systemFont; return *g_systemFont;
} }