added wxHAS_TASK_BAR_ICON

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 15f9dc9bba11e0785f3d8f9b7244aaa58bdf825c..61b46a21999c65020534165efa42e039fbc121c3 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -27,5 +27,13 @@
     #undef wxHAS_RAW_KEY_CODES
 #endif
 
+// taskbar is only implemented in wxMSW and X11 ports
+#if defined(__WXMSW__) || \
+        defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__X11__)
+    #define wxHAS_TASK_BAR_ICON
+#else
+    #undef wxHAS_TASK_BAR_ICON
+#endif
+
 #endif // _WX_FEATURES_H_
 

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 54602ec390b33bcb010ac962f35ed4ecd177f404..3c829f61a5db3204855fd47dc205c2db6751f001 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -1,6 +1,10 @@
 #ifndef _WX_TASKBAR_H_BASE_
 #define _WX_TASKBAR_H_BASE_
 
+#include "wx/defs.h"
+
+#ifdef wxHAS_TASK_BAR_ICON
+
 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------
@@ -22,7 +26,6 @@ class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
     #include "wx/unix/taskbarx11.h"
 #endif
 
-#if !defined(__WXCOCOA__) // && !defined(__WXOS2__) etc...
 // ----------------------------------------------------------------------------
 // wxTaskBarIcon events
 // ----------------------------------------------------------------------------
@@ -58,6 +61,7 @@ END_DECLARE_EVENT_TYPES()
 #define EVT_TASKBAR_RIGHT_DCLICK(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
 
 #endif
-    // !defined(__WXCOCOA__)
+    // wxHAS_TASK_BAR_ICON
+
 #endif
     // _WX_TASKBAR_H_BASE_