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 51eef48d553b29ea2b94b010ef0cc85ded26f73f..b860e78ae778007ddcf1af43db5fad84cc023164 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -193,6 +193,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',

+                         'src/_graphics.i',

                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',


@@ -207,11 +208,11 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',

-##                         'src/_pseudodc.i',
+                         'src/_pseudodc.i',

                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp',
                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp',

-##                          'src/pseudodc.cpp'
+                          'src/pseudodc.cpp'

                           ] + swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                           ] + swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,


@@ -331,6 +332,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',

+                          'src/_about.i',

                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,


@@ -495,6 +497,7 @@ swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
                                      opj(WXDIR, 'include/wx/aui/framemanager.h'),
                                      opj(WXDIR, 'include/wx/aui/floatpane.h'),
                                      opj(WXDIR, 'include/wx/aui/dockart.h'),
                                      opj(WXDIR, 'include/wx/aui/framemanager.h'),
                                      opj(WXDIR, 'include/wx/aui/floatpane.h'),
                                      opj(WXDIR, 'include/wx/aui/dockart.h'),

+                                     opj(WXDIR, 'include/wx/aui/auibook.h'),

                                      ])
 if not MONOLITHIC:
     auiLib = makeLibName('aui')
                                      ])
 if not MONOLITHIC:
     auiLib = makeLibName('aui')


@@ -683,7 +686,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
     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,
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,