X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b5f1895643cf94b38ac19a4c1151e259310852e..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/gtk/tooltip.cpp?ds=sidebyside

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index caf2a283be..6004fcc066 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,9 @@
 // global data
 //-----------------------------------------------------------------------------
 
-static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
+#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+static GtkTooltips *gs_tooltips = NULL;
+#endif
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -30,50 +35,94 @@ static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
 IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 
 wxToolTip::wxToolTip( const wxString &tip )
+    : m_text(tip)
 {
-    m_text = tip;
-    m_window = (wxWindow*) NULL;
+    m_window = NULL;
 }
 
 void wxToolTip::SetTip( const wxString &tip )
 {
     m_text = tip;
-    Apply( m_window );
+    if (m_window)
+        m_window->GTKApplyToolTip(wxGTK_CONV_SYS(m_text));
 }
 
-void wxToolTip::Apply( wxWindow *win )
+void wxToolTip::GTKSetWindow(wxWindow* win)
 {
-    if (!win) return;
-
-    if (!ss_tooltips)
-    {
-        ss_tooltips = gtk_tooltips_new();
-    }
-
+    wxASSERT(win);
     m_window = win;
+    m_window->GTKApplyToolTip(wxGTK_CONV_SYS(m_text));
+}
 
-    if (m_text.IsEmpty())
-        m_window->ApplyToolTip( ss_tooltips, (wxChar*) NULL );
+/* static */
+void wxToolTip::GTKApply(GtkWidget* widget, const char* tip)
+{
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL)
+        gtk_widget_set_tooltip_text(widget, tip);
     else
-        m_window->ApplyToolTip( ss_tooltips, m_text );
+#endif
+    {
+#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+        if ( !gs_tooltips )
+            gs_tooltips = gtk_tooltips_new();
+
+        gtk_tooltips_set_tip(gs_tooltips, widget, tip, NULL);
+#endif
+    }
 }
 
 void wxToolTip::Enable( bool flag )
 {
-    if (!ss_tooltips) return;
-
-    if (flag)
-        gtk_tooltips_enable( ss_tooltips );
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL)
+    {
+        GtkSettings* settings = gtk_settings_get_default();
+        if (settings)
+            gtk_settings_set_long_property(settings, "gtk-enable-tooltips", flag, NULL);
+    }
     else
-        gtk_tooltips_disable( ss_tooltips );
+#endif
+    {
+#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+        if (!gs_tooltips)
+            gs_tooltips = gtk_tooltips_new();
+
+        if (flag)
+            gtk_tooltips_enable( gs_tooltips );
+        else
+            gtk_tooltips_disable( gs_tooltips );
+#endif
+    }
 }
 
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!ss_tooltips)
-        return;
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (GTK_CHECK_VERSION(3,0,0) || gtk_check_version(2,12,0) == NULL)
+    {
+        GtkSettings* settings = gtk_settings_get_default();
+        if (settings)
+            gtk_settings_set_long_property(settings, "gtk-tooltip-timeout", msecs, NULL);
+    }
+    else
+#endif
+    {
+#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+        if (!gs_tooltips)
+            gs_tooltips = gtk_tooltips_new();
+
+        gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
+#endif
+    }
+}
+
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
 
-    gtk_tooltips_set_delay( ss_tooltips, (int)msecs );
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
 }
 
-#endif
+#endif // wxUSE_TOOLTIPS