applied patch for compilation with gcc 3.0

[wxWidgets.git] / src / gtk1 / tooltip.cpp

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 2e400fe04d6d6ce2a6eb3ab981444e83e08a33f0..109f4658a68f3b31284c12dc321064b0ed6d2d73 100644 (file)
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -21,6 +21,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -72,7 +74,9 @@ void wxToolTip::Apply( wxWindow *win )
            
         g_style->fg[GTK_STATE_NORMAL] = ss_fg;
         g_style->bg[GTK_STATE_NORMAL] = ss_bg;
-       
+        gdk_font_unref( g_style->font );
+           g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
+    
         gtk_widget_set_style( ss_tooltips->tip_window, g_style );
 #else
         gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
@@ -99,9 +103,11 @@ void wxToolTip::Enable( bool flag )
 
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!ss_tooltips) return;
+    if (!ss_tooltips)
+        return;
 
-    gtk_tooltips_set_delay( ss_tooltips, msecs );
+    gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
+
 #endif