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

Changes needed to be able to build with SWIG 1.3.24, 1.3.27 as well as

Browse Source 
the upcoming 1.3.28, using #if statements on SWIG_VERSION.

Adjustments to ownership of SWIG objects, add some destructors and
explicitly disown non-window objects when their ownership is
transfered to a C++ object.

Since all window objects are owned by their parent, or by themselves,
always set their thisown attribute to False.

Explicitly set thisown to False after any Destroy() methods are
called, so SWIG doesn't try to destroy them again.

Etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-29 02:09:45 +00:00
parent 9a3fba2459
commit 214c4fbea5
32 changed files with 391 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wxPython/src/_defs.i
View File

@@ -12,8 +12,8 @@
//---------------------------------------------------------------------------
// Globally turn on the autodoc feature
// Globally turn on the autodoc feature
%feature("autodoc", "1"); // 0 == no param types, 1 == show param types
// Turn on kwargs by default
@@ -22,24 +22,39 @@
// Don't generate separate wrappers for each default args combination
%feature("compactdefaultargs");
#if SWIG_VERSION < 0x010328
// Don't generate default ctors or dtors if the C++ doesn't have them
%feature("nodefault");
#else
// This is the SWIG 1.3.28 way to do the above...
// // Don't generate default ctors or dtors if the C++ doesn't have them
// %feature("nodefaultctor");
// %feature("nodefaultdtor");
%feature("nodefaultctor");
%feature("nodefaultdtor");
#endif
// For now, just supress the warning about using Python keywords as parameter
// names. Will need to come back later and correct these rather than just
// hide them...
#pragma SWIG nowarn=314
//---------------------------------------------------------------------------
// Tell SWIG to wrap all the wrappers with our thread protection by default
// Tell SWIG to wrap all the wrappers with our thread protection
%define %threadWrapperOn
%exception {
PyThreadState* __tstate = wxPyBeginAllowThreads();
$action
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
%enddef
// This one will turn off the generation of the thread wrapper code
%define %threadWrapperOff
%exception
%enddef
// Turn it on by default
%threadWrapperOn
// This one can be used to add a check for an existing wxApp before the real
// work is done. An exception is raised if there isn't one.
@@ -75,10 +90,19 @@ typedef unsigned long wxUIntPtr;
#define %pythonAppend %feature("pythonappend")
#define %pythonPrepend %feature("pythonprepend")
#define %kwargs %feature("kwargs")
#define %nokwargs %feature("kwargs", "0")
#define %noautodoc %feature("noautodoc")
#if SWIG_VERSION >= 0x010327
#define %kwargs %feature("kwargs", "1")
#define %nokwargs %feature("kwargs", "0")
#else
#define %kwargs %feature("kwargs")
#define %nokwargs %feature("nokwargs")
#endif
#define %disownarg(typespec) %typemap(in) typespec = SWIGTYPE* DISOWN
#define %cleardisown(typespec) %typemap(in) typespec
#ifndef %pythoncode