From 92f4ec38a5a69890dfca0a2eda974ec07bdec45a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Apr 2000 13:40:16 +0000
Subject: [PATCH] another warning fixed/hidden

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/settings.cpp  | 12 +++++-------
 src/gtk1/settings.cpp | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 0b4f9f064a..a0981988a2 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -233,9 +233,9 @@ wxFont wxSystemSettings::GetSystemFont( int index )
         {
             if (!g_systemFont)
             {
+#if 0
                 GdkFont *gdk_font = (GdkFont*) NULL;
                 GtkWidget *widget = gtk_button_new();
-#if 0
                 GtkStyle *def = gtk_rc_get_style( widget );
                 if (def)
                     gdk_font =  def->font;
@@ -253,13 +253,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     wxFontData font_data;
                     g_systemFont = new wxFont( font_string, font_data );
                 }
-                else
-#endif
-                {
-                    g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-                }
-                
                 gtk_widget_destroy( widget );
+#endif
+
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                
             }
             return *g_systemFont;
         }
diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 0b4f9f064a..a0981988a2 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -233,9 +233,9 @@ wxFont wxSystemSettings::GetSystemFont( int index )
         {
             if (!g_systemFont)
             {
+#if 0
                 GdkFont *gdk_font = (GdkFont*) NULL;
                 GtkWidget *widget = gtk_button_new();
-#if 0
                 GtkStyle *def = gtk_rc_get_style( widget );
                 if (def)
                     gdk_font =  def->font;
@@ -253,13 +253,11 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     wxFontData font_data;
                     g_systemFont = new wxFont( font_string, font_data );
                 }
-                else
-#endif
-                {
-                    g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-                }
-                
                 gtk_widget_destroy( widget );
+#endif
+
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                
             }
             return *g_systemFont;
         }