Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-02-10 03:43:30 +00:00
parent 6a37636b11
commit 7669dce5d2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/taskbar.h
View File

@@ -65,7 +65,7 @@ private:
#include "wx/palmos/taskbar.h" #include "wx/palmos/taskbar.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/taskbar.h" #include "wx/msw/taskbar.h"
#elif defined(__WXGTK210__) #elif defined(__WXGTK20__)
#include "wx/gtk/taskbar.h" #include "wx/gtk/taskbar.h"
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
#include "wx/unix/taskbarx11.h" #include "wx/unix/taskbarx11.h"

6
src/gtk/taskbar.cpp
View File

@@ -12,7 +12,7 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.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 "eggtrayicon.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if !GTK_CHECK_VERSION(2,10,0)
typedef struct _GtkStatusIcon GtkStatusIcon;
#endif
class wxTaskBarIcon::Private class wxTaskBarIcon::Private
{ {
public: public: