Don't use gtk_tree_model_get_path of the item is already the delete in the model...

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 19bc0e985fcaf5c8416c5746b8354123e60b2d3c..801ae68eeddee689b0f7f488edb11692425e742b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -24,7 +24,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

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

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


@@ -35,35 +35,44 @@ 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 (!gs_tooltips)
-    {
+    if ( !gs_tooltips )

         gs_tooltips = gtk_tooltips_new();
         gs_tooltips = gtk_tooltips_new();

-    }

 
     m_window = win;
 
     if (m_text.empty())
 
     m_window = win;
 
     if (m_text.empty())

-        m_window->ApplyToolTip( gs_tooltips, (wxChar*) NULL );
+        m_window->GTKApplyToolTip( gs_tooltips, NULL );

     else
     else

-        m_window->ApplyToolTip( gs_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 (!gs_tooltips) return;
+    if (!gs_tooltips)
+        return;

 
     if (flag)
         gtk_tooltips_enable( gs_tooltips );
 
     if (flag)
         gtk_tooltips_enable( gs_tooltips );


@@ -86,4 +95,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 

+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+

 #endif // wxUSE_TOOLTIPS
 #endif // wxUSE_TOOLTIPS