X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b8c7ba607a15a2ff8a04448138df9ffff7df6c5..716a5baa6ecd0d5d0c31914567e4da3165ca6ff0:/wxPython/src/_taskbar.i diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i index 71b22bf22f..abdc2c6539 100644 --- a/wxPython/src/_taskbar.i +++ b/wxPython/src/_taskbar.i @@ -61,7 +61,7 @@ enum { // Otherwise make a class that can virtualize CreatePopupMenu class wxPyTaskBarIcon : public wxTaskBarIcon { - DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon); + DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon) public: wxPyTaskBarIcon() : wxTaskBarIcon() {} @@ -69,7 +69,7 @@ public: wxMenu* CreatePopupMenu() { wxMenu *rval = NULL; bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { PyObject* ro; wxMenu* ptr; @@ -104,9 +104,11 @@ public: %pythonAppend wxPyTaskBarIcon "self._setCallbackInfo(self, TaskBarIcon, 0)" wxPyTaskBarIcon(); + ~wxPyTaskBarIcon(); void _setCallbackInfo(PyObject* self, PyObject* _class, int incref); + %pythonAppend Destroy "args[0].thisown = 0"; %extend { void Destroy() { self->RemoveIcon();