applied heavily modified patch 1116702: support for specifying disabled toolbar image...

[wxWidgets.git] / include / wx / gtk / taskbarpriv.h

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index 117e4cd04bc689d83445fd34395a8b322645e638..e2bb1da53b56dfb932bc4d006c45a940500fd495 100644 (file)
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -19,6 +19,10 @@
 #include "wx/toplevel.h"
 #include "wx/bitmap.h"
 
+#ifdef __WXGTK20__
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)
+
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {
 public:
@@ -26,6 +30,14 @@ public:
 
     // Returns true if SYSTRAY protocol is supported by the desktop
     bool IsProtocolSupported();
+    
+    wxEvtHandler *m_invokingWindow;
+    
+#if wxUSE_MENUS_NATIVE
+    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+#endif // wxUSE_MENUS_NATIVE
 };
 
+#endif // __WXGTK20__
+#endif // GTK_CHECK_VERSION(2, 1, 0)
 #endif // _WX_TASKBARPRIV_H_