From: Robin Dunn <robin@alldunn.com>
Date: Tue, 24 Jan 2006 02:24:25 +0000 (+0000)
Subject: move the nodefault option into _defs.i too.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9c605285c8e427236193c0e368e6f0700659e262

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 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