X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6466d41e9454208a9b44a7fd2839d60179d2df82..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/taskbarcmn.cpp diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp index cb6045a894..ec8bd7feca 100644 --- a/src/common/taskbarcmn.cpp +++ b/src/common/taskbarcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbarcmn.cpp +// File: src/common/taskbarcmn.cpp // Purpose: Common parts of wxTaskBarIcon class // Author: Julian Smart // Modified by: @@ -9,36 +9,41 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "taskbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_TASKBARICON + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/list.h" + #include "wx/menu.h" +#endif -#ifdef wxHAS_TASK_BAR_ICON +extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; // DLL options compatibility check: -#include "wx/app.h" WX_CHECK_BUILD_OPTIONS("wxAdvanced") - -#include "wx/menu.h" #include "wx/taskbar.h" -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK ) +wxDEFINE_EVENT( wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent ) +wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent ) BEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler) - EVT_TASKBAR_RIGHT_DOWN(wxTaskBarIconBase::OnRightButtonDown) + EVT_TASKBAR_CLICK(wxTaskBarIconBase::OnRightButtonDown) END_EVENT_TABLE() void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event)) @@ -50,5 +55,10 @@ void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event)) delete menu; } } - -#endif // defined(wxHAS_TASK_BAR_ICON) + +void wxTaskBarIconBase::Destroy() +{ + wxPendingDelete.Append(this); +} + +#endif // wxUSE_TASKBARICON