X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cae7af2f139555be2fb45e43f12b474303df630..94f6d685cb30a8e62d21254bbf19902b48eb2443:/src/gtk/tooltip.cpp?ds=sidebyside

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 19bc0e985f..a02aedd620 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -46,24 +46,33 @@ void wxToolTip::SetTip( const wxString &tip )
 
 void wxToolTip::Apply( 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->ApplyToolTip( gs_tooltips, NULL );
     else
-        m_window->ApplyToolTip( gs_tooltips, m_text );
+        m_window->ApplyToolTip( gs_tooltips, wxGTK_CONV_SYS(m_text) );
+}
+
+/* static */
+void wxToolTip::Apply(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 )
 {
-    if (!gs_tooltips) return;
+    if (!gs_tooltips)
+        return;
 
     if (flag)
         gtk_tooltips_enable( gs_tooltips );