check that the bitmap is valid before getting its size to avoid asserts

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 951b307e1d91fc305457ecea03b1ded784f76138..b860e78ae778007ddcf1af43db5fad84cc023164 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -156,8 +156,8 @@ CLEANUP.append('licence')
 
 
 if os.name == 'nt':
-    build_locale_dir(opj(PKGDIR, 'i18n'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))
+    build_locale_dir(opj(PKGDIR, 'locale'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
 
 
 if os.name == 'nt':
@@ -193,6 +193,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
+                         'src/_graphics.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
@@ -331,6 +332,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',
+                          'src/_about.i',
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
@@ -684,7 +686,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,