Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'wxPy_2_4_0_7'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_4_0_7@19683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2003-03-21 22:37:32 +00:00
parent 00fd036c18
commit f34f743e78
2226 changed files with 151510 additions and 79502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wxPython/wxSWIG/Modules/pycpp.cxx
View File

@@ -260,10 +260,15 @@ void PYTHON::cpp_destructor(char *name, char *newname) {
else realname = name;
}
*pyclass << tab4 << "def __del__(self," << module << "=" << module << "):\n";
char* dfname = name_destroy(realname);
*pyclass << tab4 << "def __del__(self, " << "delfunc=" << module<< "." << dfname << "):\n";
emitAddPragmas(*pyclass,"__del__",tab8);
*pyclass << tab8 << "if self.thisown == 1 :\n"
<< tab8 << tab4 << module << "." << name_destroy(realname) << "(self)\n";
*pyclass << tab8 << "if self.thisown == 1:\n"
<< tab8 << tab4 << "try:\n"
<< tab8 << tab8 << "delfunc(self)\n"
<< tab8 << tab4 << "except:\n"
<< tab8 << tab8 << "pass\n";
have_destructor = 1;
if (doc_entry) {

10
wxPython/wxSWIG/Modules/python.cxx
View File

@@ -484,9 +484,13 @@ PYTHON::get_pointer(char *iname, char *srcname, char *src, char *dest,
// Now get the pointer value from the string and save in dest
f << tab4 << "if (" << src << ") {\n"
<< tab8 << "if (" << src << " == Py_None) { " << dest << " = NULL; }\n"
<< tab8 << "else if (SWIG_GetPtrObj(" << src << ",(void **) &" << dest << ",";
if (t->is_reference)
f << tab4 << "if (" << src << ") {\n"
<< tab8 << "if (SWIG_GetPtrObj(" << src << ",(void **) &" << dest << ",";
else
f << tab4 << "if (" << src << ") {\n"
<< tab8 << "if (" << src << " == Py_None) { " << dest << " = NULL; }\n"
<< tab8 << "else if (SWIG_GetPtrObj(" << src << ",(void **) &" << dest << ",";
// If we're passing a void pointer, we give the pointer conversion a NULL
// pointer, otherwise pass in the expected type.