attempt to get the 'new focus' window parameter of a focus kill event set correctly

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index a02aedd620a83c10796f72b26b67d30f3a3198cb..6004fcc0663d2e18ee30b9ec30fa116b08d791a7 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -24,7 +24,9 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
+#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
+static GtkTooltips *gs_tooltips = NULL;
+#endif

 
 //-----------------------------------------------------------------------------
 // wxToolTip
 
 //-----------------------------------------------------------------------------
 // wxToolTip


@@ -33,66 +35,94 @@ static GtkTooltips *gs_tooltips = (GtkTooltips*) NULL;
 IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 
 wxToolTip::wxToolTip( const wxString &tip )
 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;
 }
 
 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 ( !gs_tooltips )
-        gs_tooltips = gtk_tooltips_new();
-
+    wxASSERT(win);

     m_window = win;
     m_window = win;

-
-    if (m_text.empty())
-        m_window->ApplyToolTip( gs_tooltips, NULL );
-    else
-        m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+    m_window->GTKApplyToolTip(wxGTK_CONV_SYS(m_text));

 }
 
 /* static */
 }
 
 /* static */

-void wxToolTip::Apply(GtkWidget *w, const gchar *tip)
+void wxToolTip::GTKApply(GtkWidget* widget, const char* tip)

 {
 {

-    if ( !gs_tooltips )
-        gs_tooltips = gtk_tooltips_new();
+#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
+#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, w, tip, NULL);
+        gtk_tooltips_set_tip(gs_tooltips, widget, tip, NULL);
+#endif
+    }

 }
 
 void wxToolTip::Enable( bool flag )
 {
 }
 
 void wxToolTip::Enable( bool flag )
 {

-    if (!gs_tooltips)
-        return;
-
-    if (flag)
-        gtk_tooltips_enable( gs_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
     else

-        gtk_tooltips_disable( gs_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
+    }

 }
 
 }
 

-G_BEGIN_DECLS
-void gtk_tooltips_set_delay (GtkTooltips *tooltips,
-                             guint delay);
-G_END_DECLS
-

 void wxToolTip::SetDelay( long msecs )
 {
 void wxToolTip::SetDelay( long msecs )
 {

-    if (!gs_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();

 
 

-    // 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 );
+        gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
+#endif
+    }
+}
+
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS