fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index caf2a283bebeccdc53d0e58c8e26cc0e4c0754ba..801ae68eeddee689b0f7f488edb11692425e742b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -13,7 +13,10 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"

-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 


@@ -21,7 +24,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
+static GtkTooltips *gs_tooltips = NULL;

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


@@ -32,48 +35,72 @@ IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
 wxToolTip::wxToolTip( const wxString &tip )
 {
     m_text = tip;
 wxToolTip::wxToolTip( const wxString &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 );
+    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;
 
 
     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
     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 )
 {
 }
 
 void wxToolTip::Enable( bool flag )
 {

-    if (!ss_tooltips) return;
+    if (!gs_tooltips)
+        return;

 
     if (flag)
 
     if (flag)

-        gtk_tooltips_enable( ss_tooltips );
+        gtk_tooltips_enable( gs_tooltips );

     else
     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 )
 {
 void wxToolTip::SetDelay( long msecs )
 {

-    if (!ss_tooltips)
+    if (!gs_tooltips)

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