[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / gtk / tooltip.cpp

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 403880e328b942042193ef453ba2041e5e3f3f0c..5f428af202fbe6bbe8f8147804e7644f85dd0467 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -7,32 +7,34 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tooltip.h"
 #endif
 
     #pragma implementation "tooltip.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/setup.h"
 
 #if wxUSE_TOOLTIPS
 
 #include "wx/setup.h"
 
 #if wxUSE_TOOLTIPS
 

-#include "wx/window.h"

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

+#include "wx/window.h"

 
 

-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;

-static GdkColor     ss_bg;
-static GdkColor     ss_fg;

 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxToolTip
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+

 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;


@@ -52,31 +54,6 @@ void wxToolTip::Apply( wxWindow *win )
     if (!ss_tooltips)
     {
         ss_tooltips = gtk_tooltips_new();
     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;
-       
-        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;
     }
 
     m_window = win;


@@ -99,9 +76,10 @@ void wxToolTip::Enable( bool flag )
 
 void wxToolTip::SetDelay( long msecs )
 {
 
 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
 }
 
 #endif