switching away from angle brackets includes, deactivating OSX workaround

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

diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 19bc0e985fcaf5c8416c5746b8354123e60b2d3c..08f55c48f4c30e40c03d13fbacf2cb3f71e33d58 100644 (file)
--- 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 );
@@ -86,4 +95,12 @@ void wxToolTip::SetDelay( long msecs )
     gtk_tooltips_set_delay( gs_tooltips, (int)msecs );
 }
 
+void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )
+{
+}
+
+void wxToolTip::SetReshow( long WXUNUSED(msecs) )
+{
+}
+
 #endif // wxUSE_TOOLTIPS