corrected build fix, new code does work with GTK+ < 2.10

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 062c3c3306e2e18259ff0e066bb6c5c6666ece3f..fdc2ea0f3a0b4f9344a112445897addf67240ce5 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -65,7 +65,7 @@ private:
     #include "wx/palmos/taskbar.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/taskbar.h"
     #include "wx/palmos/taskbar.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/taskbar.h"

-#elif defined(__WXGTK210__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/taskbar.h"
 #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "wx/unix/taskbarx11.h"
     #include "wx/gtk/taskbar.h"
 #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "wx/unix/taskbarx11.h"

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index f3069bb79ec623b86328684d864a5888e8c5aea7..8a25c000fdd528c3302110faf21d5c28655e6974 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -12,7 +12,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_TASKBARICON && defined(__WXGTK210__)
+#if wxUSE_TASKBARICON

 
 #include "wx/taskbar.h"
 
 
 #include "wx/taskbar.h"
 


@@ -25,6 +25,10 @@
 #include "eggtrayicon.h"
 #include <gtk/gtk.h>
 
 #include "eggtrayicon.h"
 #include <gtk/gtk.h>
 

+#if !GTK_CHECK_VERSION(2,10,0)
+    typedef struct _GtkStatusIcon GtkStatusIcon;
+#endif
+

 class wxTaskBarIcon::Private
 {
 public:
 class wxTaskBarIcon::Private
 {
 public: