X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb719f2e29bd20effa3259d2d7dead9fd857442c..63a65070911908802c27b52173c3306e93dd63bf:/src/common/taskbarcmn.cpp diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp index 43d0cb3119..12ab1d3d0b 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 -#ifdef wxHAS_TASK_BAR_ICON +#if wxUSE_TASKBARICON -// DLL options compatibility check: -#include "wx/app.h" -WX_CHECK_BUILD_OPTIONS("wxAdvanced") +#include "wx/taskbar.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/list.h" + #include "wx/menu.h" +#endif +extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; -#include "wx/menu.h" -#include "wx/taskbar.h" +// DLL options compatibility check: +WX_CHECK_BUILD_OPTIONS("wxAdvanced") -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)) @@ -51,4 +56,9 @@ void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event)) } } -#endif // defined(wxHAS_TASK_BAR_ICON) +void wxTaskBarIconBase::Destroy() +{ + wxPendingDelete.Append(this); +} + +#endif // wxUSE_TASKBARICON