X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9d6a93cd5974b6710f179ebdc67618ab87518b6..963a1fcd6e013eef52bf87ed99e19d9ab49563ef:/src/gtk/tooltip.cpp?ds=inline diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index f5fdd8a0f6..109f4658a6 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -21,6 +21,8 @@ #include "gtk/gtk.h" #include "gdk/gdk.h" +extern GdkFont *GtkGetDefaultGuiFont(); + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -63,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 ); } @@ -86,9 +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