X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/301cd871a221ca5c0f1c20df50c654a3e7a388fe..50f151d726bce4dc4179fbf98f8ee7c34691229c:/src/gtk/tooltip.cpp

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 44759110bf..e0d3bd03fa 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -1,49 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.cpp
-// Purpose:
+// Name:        src/gtk/tooltip.cpp
+// Purpose:     wxToolTip implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "tooltip.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TOOLTIPS
 
 #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;
     m_window = (wxWindow*) NULL;
 }
 
-bool wxToolTip::Ok() const
-{
-    return (m_window);
-}
-
-wxString wxToolTip::GetTip() const
-{
-    return m_text;
-}
-
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;
@@ -57,24 +48,12 @@ 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;
-    
+
     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 );
 }
@@ -82,17 +61,26 @@ void wxToolTip::Apply( wxWindow *win )
 void wxToolTip::Enable( bool flag )
 {
     if (!ss_tooltips) return;
-    
+
     if (flag)
         gtk_tooltips_enable( ss_tooltips );
     else
         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;
-    
-    gtk_tooltips_set_delay( ss_tooltips, msecs );
+    if (!ss_tooltips)
+        return;
+
+    // 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