X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e5aa9c48d73e1302040bee59e4f41197f33b8ee..17fce800d584151423ab1ff04bac4f3b785dff7d:/wxPython/config.py?ds=inline diff --git a/wxPython/config.py b/wxPython/config.py index 8e8b617d3d..6b8d5199e6 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -37,8 +37,8 @@ import distutils.command.clean #---------------------------------------------------------------------- VER_MAJOR = 2 # The first three must match wxWidgets -VER_MINOR = 5 -VER_RELEASE = 5 +VER_MINOR = 6 +VER_RELEASE = 0 VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets VER_FLAGS = "pre" # release flags, such as prerelease num, unicode, etc. @@ -234,6 +234,7 @@ if sys.platform[:6] == "darwin": if os.name == 'nt': WXPORT = 'msw' +WXPYTHON_TYPE_TABLE = '_wxPython_table' #---------------------------------------------------------------------- # Check for build flags on the command line @@ -679,7 +680,7 @@ if os.name == 'nt': (WXPLAT, None), ('WXUSINGDLL', '1'), - ('SWIG_TYPE_TABLE', '_wxPython_table'), + ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE), ('WXP_USE_THREAD', '1'), ] @@ -733,7 +734,7 @@ if os.name == 'nt': elif os.name == 'posix': WXDIR = '..' includes = ['include', 'src'] - defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'), + defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE), ('HAVE_CONFIG_H', None), ('WXP_USE_THREAD', '1'), ]