X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..c4e43bea7b24f7b7f58e3f87786490cd81abf0a7:/src/gtk1/tooltip.cpp

diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index d6577bfb93..141f3bc17d 100644
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.cpp
+// Name:        src/gtk1/tooltip.cpp
 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,28 +7,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "tooltip.h"
-#endif
-
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_TOOLTIPS
 
-#include "wx/window.h"
 #include "wx/tooltip.h"
 
-#include "wx/gtk/private.h"
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
-extern GdkFont *GtkGetDefaultGuiFont();
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
-static GdkColor     ss_bg;
-static GdkColor     ss_fg;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -55,38 +51,11 @@ 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_CHECK_VERSION(1, 2, 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;
-
-        SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
-
-        gtk_widget_set_style( ss_tooltips->tip_window, g_style );
-#else // GTK+ 1.0
-        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
-#endif
     }
 
     m_window = win;
 
-    if (m_text.IsEmpty())
+    if (m_text.empty())
         m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
     else
         m_window->ApplyToolTip( ss_tooltips, m_text );
@@ -111,4 +80,3 @@ void wxToolTip::SetDelay( long msecs )
 }
 
 #endif
-