added wxHAS_TASK_BAR_ICON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,5 +27,13 @@
|
|||||||
#undef wxHAS_RAW_KEY_CODES
|
#undef wxHAS_RAW_KEY_CODES
|
||||||
#endif
|
#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_
|
#endif // _WX_FEATURES_H_
|
||||||
|
|
||||||
|
@@ -1,6 +1,10 @@
|
|||||||
#ifndef _WX_TASKBAR_H_BASE_
|
#ifndef _WX_TASKBAR_H_BASE_
|
||||||
#define _WX_TASKBAR_H_BASE_
|
#define _WX_TASKBAR_H_BASE_
|
||||||
|
|
||||||
|
#include "wx/defs.h"
|
||||||
|
|
||||||
|
#ifdef wxHAS_TASK_BAR_ICON
|
||||||
|
|
||||||
#include "wx/event.h"
|
#include "wx/event.h"
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -22,7 +26,6 @@ class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
|
|||||||
#include "wx/unix/taskbarx11.h"
|
#include "wx/unix/taskbarx11.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(__WXCOCOA__) // && !defined(__WXOS2__) etc...
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxTaskBarIcon events
|
// 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),
|
#define EVT_TASKBAR_RIGHT_DCLICK(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// !defined(__WXCOCOA__)
|
// wxHAS_TASK_BAR_ICON
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_TASKBAR_H_BASE_
|
// _WX_TASKBAR_H_BASE_
|
||||||
|
Reference in New Issue
Block a user