From 7669dce5d2eaf1a5d9719dbf2d25b6735ae84d65 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 10 Feb 2009 03:43:30 +0000 Subject: [PATCH] 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 --- include/wx/taskbar.h | 2 +- src/gtk/taskbar.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index 062c3c3306..fdc2ea0f3a 100644 --- 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" -#elif defined(__WXGTK210__) +#elif defined(__WXGTK20__) #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 f3069bb79e..8a25c000fd 100644 --- 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" -#if wxUSE_TASKBARICON && defined(__WXGTK210__) +#if wxUSE_TASKBARICON #include "wx/taskbar.h" @@ -25,6 +25,10 @@ #include "eggtrayicon.h" #include +#if !GTK_CHECK_VERSION(2,10,0) + typedef struct _GtkStatusIcon GtkStatusIcon; +#endif + class wxTaskBarIcon::Private { public: -- 2.45.2