added wxXmlResource::FindXRCIDById() (#10026)

[wxWidgets.git] / src / unix / taskbarx11.cpp

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 6c3af3359f2d4f89f196d50e0350ffd178ea6b85..d1dfc5e746e42ac97fb649e464542202139d6b13 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -66,7 +66,7 @@
                       wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
                       wxSIMPLE_BORDER | wxFRAME_SHAPED) {}
 
                       wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
                       wxSIMPLE_BORDER | wxFRAME_SHAPED) {}
 

-        bool IsProtocolSupported() const { return false; }
+        static bool IsProtocolSupported() { return false; }

     };
 #endif
 
     };
 #endif
 


@@ -250,6 +250,15 @@ void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event)
     m_icon->ProcessEvent(event);
 }
 
     m_icon->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// wxTaskBarIconBase class:
+// ----------------------------------------------------------------------------
+
+bool wxTaskBarIconBase::IsAvailable()
+{
+    return wxTaskBarIconArea::IsProtocolSupported();
+}
+

 // ----------------------------------------------------------------------------
 // wxTaskBarIcon class:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTaskBarIcon class:
 // ----------------------------------------------------------------------------


@@ -264,7 +273,8 @@ wxTaskBarIcon::~wxTaskBarIcon()
 {
     if (m_iconWnd)
     {
 {
     if (m_iconWnd)
     {

-        m_iconWnd->Disconnect(wxEVT_DESTROY, NULL, NULL, this);
+        m_iconWnd->Disconnect(
+            wxEVT_DESTROY, wxObjectEventFunction(NULL), NULL, this);

         RemoveIcon();
     }
 }
         RemoveIcon();
     }
 }