move the nodefault option into _defs.i too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/config.py b/wxPython/config.py
index 0746e7f2fe3b81d319580b3ae08446f46a204980..af616106ed581e2c6cf4d1d5c3b756f29a69d6f5 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -874,7 +874,6 @@ swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',
              '-Wall',
 swig_force = force
 swig_args = ['-c++',
              '-Wall',

-             '-nodefault',

              '-python',
              '-new_repr',
              '-modern',
              '-python',
              '-new_repr',
              '-modern',

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 95a0010bb2968dc0d11fa200cec908e724b5fdfd..014339c36b4d7c5228acdebef1e23bbb52a31af5 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -19,6 +19,17 @@
 // Turn on kwargs by default
 %feature("kwargs", "1");
 
 // 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
 
 //---------------------------------------------------------------------------
 // Tell SWIG to wrap all the wrappers with our thread protection by default