Use wxGtkString here to clean up code, and not leak in debug builds

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 789278b7921c0e942c77f7a26aef40ca35e45281..e0d3bd03fa6db92227dd15a1e3875a710f09376b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.cpp
+// Name:        src/gtk/tooltip.cpp
 // Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,32 +7,28 @@
 // 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/window.h"
 
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
+#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;
@@ -52,18 +48,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 );
-
-        gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );
     }
 
     m_window = win;
@@ -84,11 +68,19 @@ void wxToolTip::Enable( bool flag )
         gtk_tooltips_disable( ss_tooltips );
 }
 
+G_BEGIN_DECLS
+void gtk_tooltips_set_delay (GtkTooltips *tooltips,
+                             guint delay);
+G_END_DECLS
+
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!ss_tooltips) return;
+    if (!ss_tooltips)
+        return;
 
-    gtk_tooltips_set_delay( ss_tooltips, msecs );
+    // FIXME: This is a deprecated function and might not even have an effect.
+    // Try to not use it, after which remove the prototype above.
+    gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
 }
-#endif
 
+#endif