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 8053dca29b4f4c3c47584dede825d6c7e00b5ca0..801ae68eeddee689b0f7f488edb11692425e742b 100644 (file)
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -41,10 +41,10 @@ wxToolTip::wxToolTip( const wxString &tip )
 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;


@@ -55,13 +55,13 @@ void wxToolTip::Apply( wxWindow *win )
     m_window = win;
 
     if (m_text.empty())
     m_window = win;
 
     if (m_text.empty())

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

     else
     else

-        m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+        m_window->GTKApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );

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

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

 {
     if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();
 {
     if ( !gs_tooltips )
         gs_tooltips = gtk_tooltips_new();