X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1c6f06900982928371d2036a81b44e410baa4cc..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/src/gtk/taskbar.cpp?ds=sidebyside

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 03bee569c7..8a25c000fd 100644
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -25,6 +25,10 @@
 #include "eggtrayicon.h"
 #include <gtk/gtk.h>
 
+#if !GTK_CHECK_VERSION(2,10,0)
+    typedef struct _GtkStatusIcon GtkStatusIcon;
+#endif
+
 class wxTaskBarIcon::Private
 {
 public:
@@ -197,9 +201,9 @@ void wxTaskBarIcon::Private::SetIcon()
         }
     }
 #if wxUSE_TOOLTIPS
-    const char* tip_text = NULL;
+    const char *tip_text = NULL;
     if (!m_tipText.empty())
-        tip_text = m_tipText;
+        tip_text = m_tipText.c_str();
 
 #if GTK_CHECK_VERSION(2,10,0)
     if (m_statusIcon)