Disown using .this.own(False) instead of .thisown = False

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-10 03:30:33 +00:00
parent 7661255894
commit 4b5a79cf54
12 changed files with 23 additions and 15 deletions

View File

@@ -191,8 +191,8 @@ in on the main display of your Mac."""
destroy(self) destroy(self)
def Destroy(self): def Destroy(self):
self.this.own(False)
wx.PyApp.Destroy(self) wx.PyApp.Destroy(self)
self.thisown = 0
def SetTopWindow(self, frame): def SetTopWindow(self, frame):
"""Set the \"main\" top level window""" """Set the \"main\" top level window"""

View File

@@ -299,7 +299,7 @@ topmost provider if platform_dependent = false", "");
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; }} %extend { void Destroy() { delete self; }}
}; };

View File

@@ -285,7 +285,7 @@ table of help strings will fill up and when window pointers are
reused, the wrong help string will be found.", ""); reused, the wrong help string will be found.", "");
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
}; };

View File

@@ -174,7 +174,7 @@ public:
void AssignFrom(const wxListItemAttr& source); void AssignFrom(const wxListItemAttr& source);
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
%property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`"); %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`");

View File

@@ -159,7 +159,7 @@ public:
} }
} }
%pythonAppend Destroy "args[0].thisown = 0"; %pythonPrepend Destroy "args[0].this.own(False)";
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
}; };

View File

@@ -140,12 +140,20 @@ public:
bool Delete(int id); bool Delete(int id);
%Rename(DeleteItem, bool, Delete(wxMenuItem *item)); %Rename(DeleteItem, bool, Delete(wxMenuItem *item));
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
// delete the item from menu and destroy it (if it's a submenu) // delete the item from menu and destroy it (if it's a submenu)
%Rename(DestroyId, bool, Destroy(int id)); %pythonPrepend Destroy "";
%Rename(DestroyItem, bool, Destroy(wxMenuItem *item)); DocDeclStrName(
bool , Destroy(int id),
"", "",
DestroyId);
DocDeclStrName(
bool , Destroy(wxMenuItem *item),
"", "",
DestroyItem);
// get the items // get the items

View File

@@ -54,7 +54,7 @@ public:
~wxCaret(); ~wxCaret();
%extend { %extend {
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
DocStr(Destroy, DocStr(Destroy,
"Deletes the C++ object this Python object is a proxy for.", ""); "Deletes the C++ object this Python object is a proxy for.", "");
void Destroy() { void Destroy() {

View File

@@ -30,7 +30,7 @@ public:
return self->GetClassInfo()->GetClassName(); return self->GetClassInfo()->GetClassName();
} }
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
DocStr(Destroy, DocStr(Destroy,
"Deletes the C++ object this Python object is a proxy for.", ""); "Deletes the C++ object this Python object is a proxy for.", "");
void Destroy() { void Destroy() {

View File

@@ -108,7 +108,7 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class, int incref); void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
%pythonAppend Destroy "args[0].thisown = 0"; %pythonPrepend Destroy "args[0].this.own(False)";
%extend { %extend {
void Destroy() { void Destroy() {
self->RemoveIcon(); self->RemoveIcon();

View File

@@ -132,7 +132,7 @@ public:
const wxTreeItemId& GetId(); const wxTreeItemId& GetId();
void SetId(const wxTreeItemId& id); void SetId(const wxTreeItemId& id);
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
%property(Data, GetData, SetData, doc="See `GetData` and `SetData`"); %property(Data, GetData, SetData, doc="See `GetData` and `SetData`");

View File

@@ -259,7 +259,7 @@ instead.");
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
DocDeclStr( DocDeclStr(
virtual bool , Destroy(), virtual bool , Destroy(),
"Destroys the window safely. Frames and dialogs are not destroyed "Destroys the window safely. Frames and dialogs are not destroyed

View File

@@ -750,7 +750,7 @@ public:
virtual void StartingClick(); virtual void StartingClick();
virtual void HandleReturn(wxKeyEvent& event); virtual void HandleReturn(wxKeyEvent& event);
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
virtual void Destroy(); virtual void Destroy();
%property(CellAttr, GetCellAttr, SetCellAttr, doc="See `GetCellAttr` and `SetCellAttr`"); %property(CellAttr, GetCellAttr, SetCellAttr, doc="See `GetCellAttr` and `SetCellAttr`");
@@ -1345,7 +1345,7 @@ public:
wxPyGridTableBase(); wxPyGridTableBase();
void _setCallbackInfo(PyObject* self, PyObject* _class); void _setCallbackInfo(PyObject* self, PyObject* _class);
%pythonAppend Destroy "args[0].thisown = 0" %pythonPrepend Destroy "args[0].this.own(False)"
%extend { void Destroy() { delete self; } } %extend { void Destroy() { delete self; } }
wxString GetTypeName( int row, int col ); wxString GetTypeName( int row, int col );