X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..e4315700228573d42a9afb1498fec4ee7b95ccb0:/src/gtk/tooltip.cpp?ds=sidebyside

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 403880e328..ec256d13be 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -21,6 +21,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -33,6 +35,8 @@ static GdkColor     ss_fg;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
@@ -65,14 +69,16 @@ void wxToolTip::Apply( wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
         gtk_tooltips_force_window( ss_tooltips );
-	
-        GtkStyle *g_style = 
+
+        GtkStyle *g_style =
           gtk_style_copy(
             gtk_widget_get_style( ss_tooltips->tip_window ) );
-	    
+
         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 +105,10 @@ 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