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

Browse Source 
'DEBIAN_2_4_3_1_SARGE_v_2_4_2_4'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/DEBIAN_2_4_3_1_SARGE_v_2_4_2_4@34395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2005-05-29 09:56:16 +00:00
parent 86118733af
commit cfd794784f
4010 changed files with 349688 additions and 169530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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.
@@ -1067,7 +1071,7 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
func << tab4 << "\"\"\"" << add_docstring(doc_entry) << "\"\"\"\n";
}
func << tab4 << "val = apply(" << module << "." << iname << ",_args,_kwargs)\n";
func << tab4 << "val = " << module << "." << iname << "(*_args,**_kwargs)\n";
if (munge_return) {
// If the output of this object has been remapped in any way, we're