remove always-true tests of unsigned >= 0

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

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 03bee569c733bbdbe9fb954ca1106481f1557b03..8a25c000fdd528c3302110faf21d5c28655e6974 100644 (file)
--- 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)