X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7f1f70f4b123468e916b3f3cf4e0d35aa62da03..e736b21a8c9295b42a528d76863559a4265dab02:/src/gtk/tooltip.cpp diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index cd0a8670e3..5dd9d17137 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -7,17 +7,23 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tooltip.h" #endif -#ifdef wxUSE_TOOLTIPS +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#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 @@ -31,6 +37,8 @@ static GdkColor ss_fg; // wxToolTip //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) + wxToolTip::wxToolTip( const wxString &tip ) { m_text = tip; @@ -61,13 +69,22 @@ void wxToolTip::Apply( wxWindow *win ) ss_bg.blue = 50000; gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg ); - gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); + 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 ); } 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 ); } @@ -84,9 +101,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