From 3191ff3b91cf9992e19d5fcf5a4e8527ee9da160 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 19 Jun 2003 22:14:06 +0000 Subject: [PATCH] added wxHAS_TASK_BAR_ICON git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/features.h | 8 ++++++++ include/wx/taskbar.h | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/wx/features.h b/include/wx/features.h index 15f9dc9bba..61b46a2199 100644 --- 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 54602ec390..3c829f61a5 100644 --- 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_ -- 2.50.0