cleaned up the checkbox creation code (~70 lines of code became 3)

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 1637fb8a9a346b672b789c5db164d69287eb1451..1fd76d1df0d03eb30222796b118540ecead5594d 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -30,9 +30,8 @@
 
 #include <strings.h>
 
-#include <gdk/gdk.h>
+#include "wx/gtk/private.h"
 #include <gdk/gdkprivate.h>
-#include <gtk/gtk.h>
 
 // ----------------------------------------------------------------------------
 // constants
@@ -656,13 +655,13 @@ extern GdkFont *GtkGetDefaultGuiFont()
         GtkStyle *def = gtk_rc_get_style( widget );
         if (def)
         {
-            g_systemDefaultGuiFont = gdk_font_ref( def->font );
+            g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
         }
         else
         {
             def = gtk_widget_get_default_style();
             if (def)
-                g_systemDefaultGuiFont = gdk_font_ref( def->font );
+                g_systemDefaultGuiFont = gdk_font_ref( GET_STYLE_FONT(def) );
         }
         gtk_widget_destroy( widget );
     }