X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1efb5db8961ac308d16ed3ae7930bd0b48c0520e..d67fc8b73514909eb198223333e11be4d900f431:/src/gtk/tooltip.cpp

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index e0d3bd03fa..801ae68eed 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include "wx/gtk/private.h"
 
@@ -21,7 +24,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
-static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *gs_tooltips = NULL;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -32,40 +35,49 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
-    m_window = (wxWindow*) NULL;
+    m_window = NULL;
 }
 
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;
-    Apply( m_window );
+    GTKApply( m_window );
 }
 
-void wxToolTip::Apply( wxWindow *win )
+void wxToolTip::GTKApply( wxWindow *win )
 {
-    if (!win) return;
+    if (!win)
+        return;
 
-    if (!ss_tooltips)
-    {
-        ss_tooltips = gtk_tooltips_new();
-    }
+    if ( !gs_tooltips )
+        gs_tooltips = gtk_tooltips_new();
 
     m_window = win;
 
-    if (m_text.IsEmpty())
-        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
+    if (m_text.empty())
+        m_window->GTKApplyToolTip( gs_tooltips, NULL );
     else
-        m_window->ApplyToolTip( ss_tooltips, m_text );
+        m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+}
+
+/* static */
+void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip)
+{
+    if ( !gs_tooltips )
+        gs_tooltips = gtk_tooltips_new();
+
+    gtk_tooltips_set_tip(gs_tooltips, w, tip, NULL);
 }
 
 void wxToolTip::Enable( bool flag )
 {
-    if (!ss_tooltips) return;
+    if (!gs_tooltips)
+        return;
 
     if (flag)
-        gtk_tooltips_enable( ss_tooltips );
+        gtk_tooltips_enable( gs_tooltips );
     else
-        gtk_tooltips_disable( ss_tooltips );
+        gtk_tooltips_disable( gs_tooltips );
 }
 
 G_BEGIN_DECLS
@@ -75,12 +87,20 @@ G_END_DECLS
 
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!ss_tooltips)
+    if (!gs_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 );
+    gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 
-#endif
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
+#endif // wxUSE_TOOLTIPS