moved wxDash typedef to gdicmn.h

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index cd0a8670e3fc07d2698a82846eef6d5a8e695bf8..a80317beeb41a896708b1793399677af59930a1b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -11,7 +11,9 @@
     #pragma implementation "tooltip.h"
 #endif
 
     #pragma implementation "tooltip.h"
 #endif
 

-#ifdef wxUSE_TOOLTIPS
+#include "wx/setup.h"
+
+#if wxUSE_TOOLTIPS

 
 #include "wx/window.h"
 #include "wx/tooltip.h"
 
 #include "wx/window.h"
 #include "wx/tooltip.h"


@@ -61,13 +63,26 @@ void wxToolTip::Apply( wxWindow *win )
         ss_bg.blue = 50000;
         gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
 
         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;
+       
+        gtk_widget_set_style( ss_tooltips->tip_window, g_style );
+#else

         gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
         gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );

+#endif

     }
 
     m_window = win;
 
     if (m_text.IsEmpty())
     }
 
     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 );
 }
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
 }


@@ -84,9 +99,11 @@ void wxToolTip::Enable( bool flag )
 
 void wxToolTip::SetDelay( long msecs )
 {
 
 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
 
 #endif