Commit pickers-fixes.patch added to 1472329 (Francesco Montorsi)

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index caf2a283bebeccdc53d0e58c8e26cc0e4c0754ba..c46b6f91904f6dc2bd802e9bcbc1fbf236f9abd5 100644 (file)
--- 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 = (GtkTooltips*) NULL;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -43,37 +46,53 @@ void wxToolTip::SetTip( const wxString &tip )
 
 void wxToolTip::Apply( 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->ApplyToolTip( gs_tooltips, (wxChar*) NULL );
     else
-        m_window->ApplyToolTip( ss_tooltips, m_text );
+        m_window->ApplyToolTip( gs_tooltips, m_text );
+}
+
+/* static */
+void wxToolTip::Apply(GtkWidget *w, const wxCharBuffer& 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
+void gtk_tooltips_set_delay (GtkTooltips *tooltips,
+                             guint delay);
+G_END_DECLS
+
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!ss_tooltips)
+    if (!gs_tooltips)
         return;
 
-    gtk_tooltips_set_delay( ss_tooltips, (int)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( gs_tooltips, (int)msecs );
 }
 
-#endif
+#endif // wxUSE_TOOLTIPS