X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6819de8da101f1ec62f25648de5d2d132e02daf..cc378c2d7521e58e6f067470b798e9c81dd08c61:/src/unix/taskbarx11.cpp?ds=sidebyside diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 6c3af3359f..d1dfc5e746 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -66,7 +66,7 @@ wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxSIMPLE_BORDER | wxFRAME_SHAPED) {} - bool IsProtocolSupported() const { return false; } + static bool IsProtocolSupported() { return false; } }; #endif @@ -250,6 +250,15 @@ void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event) m_icon->ProcessEvent(event); } +// ---------------------------------------------------------------------------- +// wxTaskBarIconBase class: +// ---------------------------------------------------------------------------- + +bool wxTaskBarIconBase::IsAvailable() +{ + return wxTaskBarIconArea::IsProtocolSupported(); +} + // ---------------------------------------------------------------------------- // wxTaskBarIcon class: // ---------------------------------------------------------------------------- @@ -264,7 +273,8 @@ wxTaskBarIcon::~wxTaskBarIcon() { if (m_iconWnd) { - m_iconWnd->Disconnect(wxEVT_DESTROY, NULL, NULL, this); + m_iconWnd->Disconnect( + wxEVT_DESTROY, wxObjectEventFunction(NULL), NULL, this); RemoveIcon(); } }