fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

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: