X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff8bfdbbb14af4cd77de9d3534b1cd4f7a033137..79954978c03064b8e2a28c0b8892d9e759e1550e:/src/gtk/tooltip.cpp

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index dde56c65ee..d6577bfb93 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -11,11 +11,16 @@
     #pragma implementation "tooltip.h"
 #endif
 
+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS
+
 #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
@@ -29,6 +34,8 @@ static GdkColor     ss_fg;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
@@ -59,13 +66,28 @@ 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;
 
     if (m_text.IsEmpty())
-        m_window->ApplyToolTip( ss_tooltips, (char*) NULL );
+        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
 }
@@ -82,8 +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
+