Oops, CenteronScreen wasn't really removed, just moved to wxTopLevelWindow

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

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index 88fd35bae9fc6627be682f038d23d5c61a94cabc..abdc2c65396c9240ccbd5b0ea6b11a525450d198 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
 {
-    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;
@@ -97,15 +97,18 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon);
 
 MustHaveApp(wxPyTaskBarIcon);
 
-%name(TaskBarIcon)class wxPyTaskBarIcon : public wxEvtHandler
+%rename(TaskBarIcon) wxPyTaskBarIcon;
+class wxPyTaskBarIcon : public wxEvtHandler
 {
 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();