Fix/hack 1.

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index dde56c65eeb758a637cffda48f8e8c7ca426b271..109f4658a68f3b31284c12dc321064b0ed6d2d73 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -11,12 +11,18 @@
     #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"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -59,13 +65,28 @@ void wxToolTip::Apply( wxWindow *win )
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
 
+#if (GTK_MINOR_VERSION > 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;
+        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 );
+#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 +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
+