Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged the wxPy_newswig branch into the HEAD branch (main trunk)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-12 21:34:20 +00:00
parent eb6a4098a0
commit d14a1e2856
987 changed files with 671143 additions and 783083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

364
wxPython/setup.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python
#----------------------------------------------------------------------
import sys, os, glob, fnmatch, commands
import sys, os, glob, fnmatch
from distutils.core import setup, Extension
from distutils.file_util import copy_file
from distutils.dir_util import mkpath
@@ -17,7 +17,7 @@ VER_MAJOR = 2 # The first three must match wxWindows
VER_MINOR = 5
VER_RELEASE = 1
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
VER_FLAGS = "p1" # release flags, such as prerelease num, unicode, etc.
VER_FLAGS = "p3" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
@@ -64,7 +64,7 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
# to be loaded from a DLL and to be used from Python.
# Internet Explorer wrapper (experimental)
BUILD_IEWIN = (os.name == 'nt')
BUILD_IEWIN = 0 #(os.name == 'nt')
CORE_ONLY = 0 # if true, don't build any of the above
@@ -74,18 +74,14 @@ PREP_ONLY = 0 # Only run the prepatory steps, not the actual build.
USE_SWIG = 0 # Should we actually execute SWIG, or just use the
# files already in the distribution?
SWIG = "swig" # The swig executable to use.
BUILD_RENAMERS = 1 # Should we build the renamer modules too?
UNICODE = 0 # This will pass the 'wxUSE_UNICODE' flag to SWIG and
# will ensure that the right headers are found and the
# right libs are linked.
IN_CVS_TREE = 1 # Set to true if building in a full wxWindows CVS
# tree, or the new style of a full wxPythonSrc tarball.
# wxPython used to be distributed as a separate source
# tarball without the wxWindows but with a copy of the
# needed contrib code. That's no longer the case and so
# this setting is now defaulting to true. Eventually it
# should be removed entirly.
UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by default defines NDEBUG,
# and distutils will pick this up and use it on the
# compile command-line for the extensions. This could
@@ -158,7 +154,7 @@ def libFlag():
# Some other globals
#----------------------------------------------------------------------
PKGDIR = 'wxPython'
PKGDIR = 'wx'
wxpExtensions = []
DATA_FILES = []
@@ -181,8 +177,8 @@ if os.name == 'nt':
# Boolean (int) flags
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS', 'BUILD_RENAMERS',
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if sys.argv[x].find(flag) == 0:
@@ -192,7 +188,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
sys.argv[x] = ''
# String options
for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT']:
for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG']:
for x in range(len(sys.argv)):
if sys.argv[x].find(option) == 0:
pos = sys.argv[x].find('=') + 1
@@ -244,6 +240,7 @@ def Verify_WX_CONFIG():
def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=[]):
"""Run SWIG the way I want it done"""
if not os.path.exists(os.path.join(dir, gendir)):
os.mkdir(os.path.join(dir, gendir))
@@ -253,7 +250,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
basefile = os.path.splitext(file)[0]
i_file = os.path.join(dir, file)
py_file = os.path.join(dir, gendir, basefile+'.py')
cpp_file = os.path.join(dir, gendir, basefile+'.cpp')
cpp_file = os.path.join(dir, gendir, basefile+'_wrap.cpp')
sources.append(cpp_file)
@@ -264,14 +261,25 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
break
if force or newer(i_file, py_file) or newer(i_file, cpp_file):
# we need forward slashes here even on win32
cpp_file = '/'.join(cpp_file.split('\\'))
i_file = '/'.join(i_file.split('\\'))
## we need forward slashes here even on win32
#cpp_file = opj(cpp_file) #'/'.join(cpp_file.split('\\'))
#i_file = opj(i_file) #'/'.join(i_file.split('\\'))
cmd = ['./wxSWIG/wxswig'] + swig_args + ['-I'+dir, '-c', '-o', cpp_file, i_file]
if BUILD_RENAMERS:
# first run build_renamers
cmd = [ sys.executable, '-u',
'./distrib/build_renamers.py',
i_file, '-D'+WXPLAT, ] + \
[x for x in swig_args if x.startswith('-I')]
msg(' '.join(cmd))
spawn(cmd)
# Then run swig for real
cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file, i_file]
msg(' '.join(cmd))
spawn(cmd)
# copy the generated python file to the package directory
copy_file(py_file, package, update=not force, verbose=0)
@@ -349,7 +357,7 @@ def makeLibName(name):
def adjustCFLAGS(cflags, defines, includes):
'''Extract the raw -I, -D, and -U flags and put them into
'''Extrace the raw -I, -D, and -U flags and put them into
defines and includes as needed.'''
newCFLAGS = []
for flag in cflags:
@@ -370,7 +378,7 @@ def adjustCFLAGS(cflags, defines, includes):
def adjustLFLAGS(lfags, libdirs, libs):
'''Extract the -L and -l flags and put them in libdirs and libs as needed'''
'''Extrace the -L and -l flags and put them in libdirs and libs as needed'''
newLFLAGS = []
for flag in lflags:
if flag[:2] == '-L':
@@ -421,8 +429,8 @@ if os.name == 'nt':
WXPLAT = '__WXMSW__'
GENDIR = 'msw'
includes = ['src',
opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
includes = ['include', 'src',
opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
opj(WXDIR, 'include'),
opj(WXDIR, 'contrib', 'include'),
]
@@ -434,7 +442,6 @@ if os.name == 'nt':
('WXUSINGDLL', '1'),
('SWIG_GLOBAL', None),
('HAVE_CONFIG_H', None),
('WXP_USE_THREAD', '1'),
]
@@ -480,8 +487,8 @@ if os.name == 'nt':
#----------------------------------------------------------------------
elif os.name == 'posix':
WXDIR = '..' # assumes IN_CVS_TREE
includes = ['src']
WXDIR = '..'
includes = ['include', 'src']
defines = [('SWIG_GLOBAL', None),
('HAVE_CONFIG_H', None),
('WXP_USE_THREAD', '1'),
@@ -539,12 +546,11 @@ elif os.name == 'posix':
cflags += portcfg.split()
# If you get unresolved symbol errors on Solaris and are using gcc, then
# uncomment this block to add the right flags to the link step and build
# again.
## if os.uname()[0] == 'SunOS':
## libs.append('gcc')
## libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])
# Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
# wx-config doesn't output that for some reason. For now, just
# add it unconditionally but we should really check if the lib is
# really found there or wx-config should be fixed.
libdirs.append("/usr/X11R6/lib")
# Move the various -I, -D, etc. flags we got from the *config scripts
@@ -579,16 +585,16 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
open('src/__version__.py', 'w').write("""\
# This file was generated by setup.py...
wxVERSION_STRING = '%(VERSION)s'
wxMAJOR_VERSION = %(VER_MAJOR)s
wxMINOR_VERSION = %(VER_MINOR)s
wxRELEASE_VERSION = %(VER_RELEASE)s
wxSUBREL_VERSION = %(VER_SUBREL)s
VERSION_STRING = '%(VERSION)s'
MAJOR_VERSION = %(VER_MAJOR)s
MINOR_VERSION = %(VER_MINOR)s
RELEASE_VERSION = %(VER_RELEASE)s
SUBREL_VERSION = %(VER_SUBREL)s
wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
wxSUBREL_VERSION, '%(VER_FLAGS)s')
VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
SUBREL_VERSION, '%(VER_FLAGS)s')
wxRELEASE_NUMBER = wxRELEASE_VERSION # for compatibility
RELEASE_NUMBER = RELEASE_VERSION # for compatibility
""" % globals())
@@ -598,17 +604,35 @@ wxRELEASE_NUMBER = wxRELEASE_VERSION # for compatibility
# SWIG defaults
#----------------------------------------------------------------------
swig_cmd = SWIG
swig_force = force
swig_args = ['-c++', '-shadow', '-python', '-keyword',
'-dnone',
#'-dascii',
#'-docstring', '-Sbefore',
'-I./src', '-D'+WXPLAT,
swig_args = ['-c++',
'-Wall',
'-nodefault',
## '-xml',
'-python',
'-keyword',
'-new_repr',
'-modern',
'-I./src',
'-D'+WXPLAT,
'-c'
]
if UNICODE:
swig_args.append('-DwxUSE_UNICODE')
swig_deps = ['src/my_typemaps.i']
swig_deps = [ 'src/my_typemaps.i',
'src/common.swg',
'src/pyrun.swg',
]
depends = [ #'include/wx/wxPython/wxPython.h',
#'include/wx/wxPython/wxPython_int.h',
#'src/pyclasses.h',
]
#----------------------------------------------------------------------
@@ -616,24 +640,39 @@ swig_deps = ['src/my_typemaps.i']
#----------------------------------------------------------------------
msg('Preparing CORE...')
swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
'printfw.i', 'sizers.i', 'clip_dnd.i',
'filesys.i', 'streams.i', 'utils.i', 'fonts.i'
]
swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_app.i',
'src/_app_ex.py',
'src/_constraints.i',
'src/_core_api.i',
'src/_core_ex.py',
'src/_core_rename.i',
'src/_core_reverse.txt',
'src/_defs.i',
'src/_event.i',
'src/_event_ex.py',
'src/_evthandler.i',
'src/_filesys.i',
'src/_gdicmn.i',
'src/_image.i',
'src/_menu.i',
'src/_obj.i',
'src/_sizers.i',
'src/_gbsizer.i',
'src/_streams.i',
'src/_validator.i',
'src/_window.i',
])
copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
if IN_CVS_TREE: # update the license files
mkpath('licence')
for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
# update the license files
mkpath('licence')
for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
if os.name == 'nt':
@@ -647,9 +686,8 @@ else:
rc_file = []
ext = Extension('wxc', ['src/helpers.cpp',
'src/drawlist.cpp',
'src/libpy.c',
ext = Extension('_core', ['src/helpers.cpp',
'src/libpy.c',
] + rc_file + swig_sources,
include_dirs = includes,
@@ -660,80 +698,194 @@ ext = Extension('wxc', ['src/helpers.cpp',
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the grid module
swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('gridc', swig_sources,
# Extension for the GDI module
swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_gdi_rename.i',
'src/_bitmap.i', 'src/_brush.i',
'src/_colour.i', 'src/_cursor.i',
'src/_dc.i', 'src/_font.i',
'src/_gdiobj.i', 'src/_icon.i',
'src/_imaglist.i', 'src/_pen.i',
'src/_region.i', 'src/_palette.i',
'src/_stockobjs.i', 'src/_dragimg.i',
'src/_effects.i',
'src/_intl.i',
'src/_intl_ex.py',
])
ext = Extension('_gdi', ['src/drawlist.cpp'] + swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the html modules
swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('htmlc', swig_sources,
# Extension for the windows module
swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_windows_rename.i', 'src/_windows_reverse.txt',
'src/_panel.i',
'src/_accel.i',
'src/_toplvl.i', 'src/_statusbar.i',
'src/_splitter.i', 'src/_sashwin.i',
'src/_popupwin.i', 'src/_tipwin.i',
'src/_vscroll.i', 'src/_taskbar.i',
'src/_cmndlgs.i', 'src/_mdi.i',
'src/_pywindows.i', 'src/_printfw.i',
])
ext = Extension('_windows', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the calendar module
# Extension for the controls module
swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_controls_rename.i', 'src/_controls_reverse.txt',
'src/_control.i', 'src/_toolbar.i',
'src/_button.i', 'src/_checkbox.i',
'src/_choice.i', 'src/_combobox.i',
'src/_gauge.i', 'src/_statctrls.i',
'src/_listbox.i', 'src/_textctrl.i',
'src/_scrolbar.i', 'src/_spin.i',
'src/_radio.i', 'src/_slider.i',
'src/_tglbtn.i', 'src/_notebook.i',
'src/_listctrl.i', 'src/_treectrl.i',
'src/_dirctrl.i', 'src/_pycontrol.i',
'src/_cshelp.i',
])
ext = Extension('_controls', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the misc module
swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_settings.i', 'src/_functions.i',
'src/_misc.i', 'src/_tipdlg.i',
'src/_timer.i', 'src/_log.i',
'src/_process.i', 'src/_joystick.i',
'src/_wave.i', 'src/_mimetype.i',
'src/_artprov.i', 'src/_config.i',
'src/_datetime.i', 'src/_dataobj.i',
'src/_dnd.i',
'src/_clipbrd.i',
])
ext = Extension('_misc', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
##
## Core modules that are not in the "core" namespace start here
##
swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('calendarc', swig_sources,
ext = Extension('_calendar', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the help module
swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR,
swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('helpc', swig_sources,
ext = Extension('_grid', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
# Extension for the wizard module
swig_sources = run_swig(['html.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('_html', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('wizardc', swig_sources,
ext = Extension('_wizard', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
depends = depends
)
wxpExtensions.append(ext)
#----------------------------------------------------------------------
# Define the GLCanvas extension module
#----------------------------------------------------------------------
@@ -741,9 +893,8 @@ wxpExtensions.append(ext)
if BUILD_GLCANVAS:
msg('Preparing GLCANVAS...')
location = 'contrib/glcanvas'
swig_files = ['glcanvas.i']
swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
swig_sources = run_swig(['glcanvas.i'], location, GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
gl_libs = []
@@ -755,7 +906,7 @@ if BUILD_GLCANVAS:
gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
gl_lflags = lflags
ext = Extension('glcanvasc',
ext = Extension('_glcanvas',
swig_sources,
include_dirs = includes,
@@ -779,13 +930,16 @@ if BUILD_OGL:
msg('Preparing OGL...')
location = 'contrib/ogl'
swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
'oglcanvas.i']
swig_sources = run_swig(['ogl.i'], location, '', PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ '%s/_oglbasic.i' % location,
'%s/_oglshapes.i' % location,
'%s/_oglshapes2.i' % location,
'%s/_oglcanvas.i' % location,
'%s/_ogldefs.i' % location,
])
swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('oglc',
ext = Extension('_ogl',
swig_sources,
include_dirs = includes,
@@ -830,16 +984,12 @@ if BUILD_STC:
## os.chdir(cwd)
swig_files = ['stc_.i']
swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
swig_sources = run_swig(['stc.i'], location, '', PKGDIR,
USE_SWIG, swig_force,
swig_args + ['-I'+STC_H, '-I'+location],
[opj(STC_H, 'stc.h')] + swig_deps)
# copy a contrib project specific py module to the main package dir
copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
ext = Extension('stc_c',
ext = Extension('_stc',
swig_sources,
include_dirs = includes,
@@ -895,11 +1045,17 @@ if BUILD_XRC:
msg('Preparing XRC...')
location = 'contrib/xrc'
swig_files = ['xrc.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
swig_sources = run_swig(['xrc.i'], location, '', PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ '%s/_xrc_rename.i' % location,
'%s/_xrc_ex.py' % location,
'%s/_xmlres.i' % location,
'%s/_xmlsub.i' % location,
'%s/_xml.i' % location,
'%s/_xmlhandler.i' % location,
])
ext = Extension('xrcc',
ext = Extension('_xrc',
swig_sources,
include_dirs = includes,
@@ -924,11 +1080,10 @@ if BUILD_GIZMOS:
msg('Preparing GIZMOS...')
location = 'contrib/gizmos'
swig_files = ['gizmos.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR,
swig_sources = run_swig(['gizmos.i'], location, '', PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('gizmosc',
ext = Extension('_gizmos',
[ '%s/treelistctrl.cpp' % location ] + swig_sources,
include_dirs = includes,
@@ -1011,7 +1166,7 @@ DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html')
if __name__ == "__main__":
if not PREP_ONLY:
setup(name = PKGDIR,
setup(name = 'wxPython',
version = VERSION,
description = DESCRIPTION,
long_description = LONG_DESCRIPTION,
@@ -1023,17 +1178,13 @@ if __name__ == "__main__":
platforms = PLATFORMS,
classifiers = filter(None, CLASSIFIERS.split("\n")),
keywords = KEYWORDS,
packages = ['wxPython',
'wxPython.lib',
'wxPython.lib.colourchooser',
'wxPython.lib.editor',
'wxPython.lib.mixins',
'wxPython.lib.PyCrust',
'wxPython.py',
'wxPython.py.wxd',
'wxPython.tools',
'wxPython.tools.XRCed',
'wx',
'wx.lib',
@@ -1041,6 +1192,7 @@ if __name__ == "__main__":
'wx.lib.editor',
'wx.lib.mixins',
'wx.py',
'wx.py.wxd',
'wx.tools',
'wx.tools.XRCed',
],