X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f8102974ba0da7eeb96ad83563629726b687792..ab552aa4d7f70363c6a3c6dd5b26d144c23b271c:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 0746e7f2fe..09a8e0e3fe 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -155,12 +155,12 @@ WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
 
 SYS_WX_CONFIG = None # When installing an in tree build, setup.py uses wx-config
                      # for two different purposes.  First, to determine the prefix
-		     # where files will be installed, and secondly, to initialise
-		     # build_options.py with the correct options for it.
-		     # WX_CONFIG is used for the first task.  SYS_WX_CONFIG may
-		     # be set independently, to the value that should appear in
-		     # build_options.py, if it is different to that.  The default
-		     # is to use the value of WX_CONFIG.
+                     # where files will be installed, and secondly, to initialise
+                     # build_options.py with the correct options for it.
+                     # WX_CONFIG is used for the first task.  SYS_WX_CONFIG may
+                     # be set independently, to the value that should appear in
+                     # build_options.py, if it is different to that.  The default
+                     # is to use the value of WX_CONFIG.
 
 WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets available.
                    # Setting this value lets you select which will be used for
@@ -700,6 +700,7 @@ if os.name == 'nt':
                 ('WXUSINGDLL', '1'),
 
                 ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
+                ('SWIG_PYTHON_OUTPUT_TUPLE', None),
                 ('WXP_USE_THREAD', '1'),
                 ]
 
@@ -754,7 +755,7 @@ elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
     defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
-               ('HAVE_CONFIG_H', None),
+               ('SWIG_PYTHON_OUTPUT_TUPLE', None),
                ('WXP_USE_THREAD', '1'),
                ]
     if UNDEF_NDEBUG:
@@ -873,8 +874,7 @@ i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',
-             '-Wall',
-             '-nodefault',
+             #'-Wall',
              '-python',
              '-new_repr',
              '-modern',