X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..dc8005e2062bdc3cae2554a8519e264c6d8ce9c7:/src/gtk/tooltip.cpp diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index 109f4658a6..3a679894d2 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tooltip.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/setup.h" #if wxUSE_TOOLTIPS @@ -18,23 +21,20 @@ #include "wx/window.h" #include "wx/tooltip.h" -#include "gtk/gtk.h" -#include "gdk/gdk.h" - -extern GdkFont *GtkGetDefaultGuiFont(); +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL; -static GdkColor ss_bg; -static GdkColor ss_fg; //----------------------------------------------------------------------------- // wxToolTip //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) + wxToolTip::wxToolTip( const wxString &tip ) { m_text = tip; @@ -54,33 +54,6 @@ void wxToolTip::Apply( wxWindow *win ) if (!ss_tooltips) { ss_tooltips = gtk_tooltips_new(); - - ss_fg.red = 0; - ss_fg.green = 0; - ss_fg.blue = 0; - gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_fg ); - - ss_bg.red = 65535; - ss_bg.green = 65535; - 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;