X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cad880f57fa2754a5bd9e3407a09ebac1e77c71c..c2754d29034199bc158fc079f91c7bca15d40037:/src/gtk1/tooltip.cpp diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp index bbe7fa2fbb..a80317beeb 100644 --- a/src/gtk1/tooltip.cpp +++ b/src/gtk1/tooltip.cpp @@ -11,7 +11,7 @@ #pragma implementation "tooltip.h" #endif -#include "wx/defs.h" +#include "wx/setup.h" #if wxUSE_TOOLTIPS @@ -63,13 +63,26 @@ 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; + + 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 ); } @@ -86,9 +99,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