X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05939a8140e0d0003e8859745d5b381a5dbe0da5..70914290a18a1c95c16ff5148d53f3dea52d2940:/src/gtk1/tooltip.cpp?ds=sidebyside

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index 789278b792..d6577bfb93 100644
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -18,8 +18,9 @@
 #include "wx/window.h"
 #include "wx/tooltip.h"
 
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"
+
+extern GdkFont *GtkGetDefaultGuiFont();
 
 //-----------------------------------------------------------------------------
 // global data
@@ -33,6 +34,8 @@ static GdkColor     ss_fg;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
@@ -63,7 +66,22 @@ void wxToolTip::Apply( wxWindow *win )
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
 
+#if GTK_CHECK_VERSION(1, 2, 0)
+        gtk_tooltips_force_window( ss_tooltips );
+
+        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;
+
+        SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
+
+        gtk_widget_set_style( ss_tooltips->tip_window, g_style );
+#else // GTK+ 1.0
         gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
+#endif
     }
 
     m_window = win;
@@ -86,9 +104,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