added a test to check how exception handling works with Win32 SEH; corrected copyright

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 94e9e9c76aa2316c3d4bcff0e33f65f6ee549fa1..158d6e79a331b3952cc618ff4e0b47ef926ff1b2 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -644,7 +644,7 @@ if os.name == 'nt':
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 

-                ('SWIG_GLOBAL', None),
+                ('SWIG_TYPE_TABLE', 'wxPython_type_table'),

                 ('WXP_USE_THREAD', '1'),
                 ]
 
                 ('WXP_USE_THREAD', '1'),
                 ]
 


@@ -698,7 +698,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']

-    defines = [('SWIG_GLOBAL', None),
+    defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),

                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]


@@ -813,7 +813,6 @@ swig_args = ['-c++',
 
              '-I' + opj(WXPY_SRC, 'src'),
              '-D'+WXPLAT,
 
              '-I' + opj(WXPY_SRC, 'src'),
              '-D'+WXPLAT,

-             '-noruntime'

              ]
 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')
              ]
 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')


@@ -823,10 +822,7 @@ if FULL_DOCS:
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),

-              opj(WXPY_SRC, 'src/my_fragments.i'),
-              opj(WXPY_SRC, 'src/common.swg'),
-              opj(WXPY_SRC, 'src/pyrun.swg'),
-              opj(WXPY_SRC, 'src/python.swg'),
+              opj(WXPY_SRC, 'src/pyfragments.swg'),

               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',