X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cae7af2f139555be2fb45e43f12b474303df630..e8fd252ef87d8ff6409d405218ff02c91b980e0a:/src/gtk/tooltip.cpp

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 19bc0e985f..53707efbc7 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -24,7 +24,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
-static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *gs_tooltips = NULL;
 
 //-----------------------------------------------------------------------------
 // wxToolTip
@@ -35,40 +35,70 @@ 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 (!gs_tooltips)
-    {
+    if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();
-    }
 
     m_window = win;
 
     if (m_text.empty())
-        m_window->ApplyToolTip( gs_tooltips, (wxChar*) NULL );
+        m_window->GTKApplyToolTip( gs_tooltips, NULL );
     else
-        m_window->ApplyToolTip( gs_tooltips, m_text );
+        m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
 }
 
-void wxToolTip::Enable( bool flag )
+/* static */
+void wxToolTip::GTKApply(GtkWidget *w, const gchar *tip)
 {
-    if (!gs_tooltips) return;
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (!gtk_check_version(2, 12, 0))
+    {
+        gtk_widget_set_tooltip_text(w, tip);
+    }
+    else
+#endif
+    {
+        if ( !gs_tooltips )
+            gs_tooltips = gtk_tooltips_new();
 
-    if (flag)
-        gtk_tooltips_enable( gs_tooltips );
+        gtk_tooltips_set_tip(gs_tooltips, w, tip, NULL);
+    }
+}
+
+void wxToolTip::Enable( bool flag )
+{
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (!gtk_check_version(2, 12, 0))
+    {
+        GtkSettings* settings = gtk_settings_get_default();
+        if(!settings)
+            return;
+        gtk_settings_set_long_property(settings, "gtk-enable-tooltips", flag?TRUE:FALSE, NULL);
+    }
     else
-        gtk_tooltips_disable( gs_tooltips );
+#endif
+    {
+        if (!gs_tooltips)
+            return;
+
+        if (flag)
+            gtk_tooltips_enable( gs_tooltips );
+        else
+            gtk_tooltips_disable( gs_tooltips );
+    }
 }
 
 G_BEGIN_DECLS
@@ -78,12 +108,32 @@ G_END_DECLS
 
 void wxToolTip::SetDelay( long msecs )
 {
-    if (!gs_tooltips)
-        return;
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (!gtk_check_version(2, 12, 0))
+    {
+        GtkSettings* settings = gtk_settings_get_default();
+        if(!settings)
+            return;
+        gtk_settings_set_long_property(settings, "gtk-tooltip-timeout", msecs, NULL);
+    }
+    else
+#endif
+    {
+        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( gs_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 );
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
 }
 
 #endif // wxUSE_TOOLTIPS