Avoid assert on wxMac

[wxWidgets.git] / wxPython / src / _taskbar.i

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index 71b22bf22f776b29bae0a5273fc9865e7304897a..9ae6d122506717ea14e36475c0d18a2f4aca5ac6 100644 (file)
--- 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
 {
 // Otherwise make a class that can virtualize CreatePopupMenu
 class wxPyTaskBarIcon : public wxTaskBarIcon
 {

-    DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon);
+    DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon)

 public:
     wxPyTaskBarIcon() : wxTaskBarIcon()
     {}
 public:
     wxPyTaskBarIcon() : wxTaskBarIcon()
     {}


@@ -69,7 +69,7 @@ public:
     wxMenu* CreatePopupMenu() {
         wxMenu *rval = NULL;
         bool found;
     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;
         if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) {
             PyObject* ro;
             wxMenu* ptr;


@@ -104,9 +104,11 @@ public:
     %pythonAppend wxPyTaskBarIcon   "self._setCallbackInfo(self, TaskBarIcon, 0)"
 
     wxPyTaskBarIcon();
     %pythonAppend wxPyTaskBarIcon   "self._setCallbackInfo(self, TaskBarIcon, 0)"
 
     wxPyTaskBarIcon();

+    ~wxPyTaskBarIcon();

 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
 

+    %pythonPrepend Destroy "args[0].this.own(False)";

     %extend {
         void Destroy() {
             self->RemoveIcon();
     %extend {
         void Destroy() {
             self->RemoveIcon();