fix unused vars for watcom

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 6545b24fd24d067ac9718c59b609d893db70b653..8735f843f7a2c0571a87a100dda62d2bac96150f 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -856,7 +856,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     M_FONTDATA->SetEncoding(encoding);
 }
 
-void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
     Unshare();
 
@@ -886,13 +886,13 @@ extern GdkFont *GtkGetDefaultGuiFont()
         GtkStyle *def = gtk_rc_get_style( widget );
         if (def)
         {
-            g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+            g_systemDefaultGuiFont = gdk_font_ref( def->font );
         }
         else
         {
             def = gtk_widget_get_default_style();
             if (def)
-                g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
+                g_systemDefaultGuiFont = gdk_font_ref( def->font );
         }
         gtk_widget_destroy( widget );
     }