diff --git a/wxPython/config.py b/wxPython/config.py index 0746e7f2fe..af616106ed 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -874,7 +874,6 @@ swig_cmd = SWIG swig_force = force swig_args = ['-c++', '-Wall', - '-nodefault', '-python', '-new_repr', '-modern', diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 95a0010bb2..014339c36b 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -19,6 +19,17 @@ // Turn on kwargs by default %feature("kwargs", "1"); +// Don't generate separate wrappers for each default args combination +%feature("compactdefaultargs"); + +// Don't generate default ctors or dtors if the C++ doesn't have them +%feature("nodefault"); + +// 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"); + //--------------------------------------------------------------------------- // Tell SWIG to wrap all the wrappers with our thread protection by default