rebaked after evtloopmsw.cpp removal

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index f0068aa9ecdf3d11ef2ad8cfb576f0191a2ef9fe..b8a1f05f4f2888ffbdcc4dbeb0aba590c71e6afd 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -189,8 +189,7 @@ wxpExtensions.append(ext)
 # 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/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
                          'src/_graphics.i',
@@ -233,9 +232,7 @@ wxpExtensions.append(ext)
 # 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/_panel.i',
                          'src/_toplvl.i',
                          'src/_statusbar.i',
                          'src/_splitter.i',
@@ -267,9 +264,7 @@ wxpExtensions.append(ext)
 # 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/_toolbar.i',
+                        [ 'src/_toolbar.i',
                           'src/_button.i',
                           'src/_checkbox.i',
                           'src/_choice.i',
@@ -293,6 +288,8 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_datectrl.i',
                           'src/_hyperlink.i',
                           'src/_picker.i',
+                          'src/_collpane.i',
+                          'src/_srchctrl.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -312,9 +309,7 @@ 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/__misc_rename.i',
-                          'src/__misc_reverse.txt',
-                          'src/_settings.i',
+                        [ 'src/_settings.i',
                           'src/_functions.i',
                           'src/_misc.i',
                           'src/_tipdlg.i',
@@ -367,6 +362,20 @@ ext = Extension('_calendar', swig_sources,
 wxpExtensions.append(ext)
 
 
+swig_sources = run_swig(['combo.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_combo', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+wxpExtensions.append(ext)
+
+
 swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_grid', swig_sources,
@@ -397,7 +406,7 @@ wxpExtensions.append(ext)
 
 
 mediaLibs = libs[:]
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('media', libdirs):
     mediaLibs += makeLibName('media')
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
@@ -445,14 +454,14 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        [ 'src/_xrc_rename.i',
-                          'src/_xrc_ex.py',
+                        [ 'src/_xrc_ex.py',
                           'src/_xmlres.i',
                           'src/_xmlsub.i',
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])
-if not MONOLITHIC:
+
+if not MONOLITHIC and findLib('xrc', libdirs):
     xrcLib = makeLibName('xrc')
 else:
     xrcLib = []
@@ -474,7 +483,7 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('richtext', libdirs):
     richLib = makeLibName('richtext')
 else:
     richLib = []
@@ -499,8 +508,9 @@ swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
                                      opj(WXDIR, 'include/wx/aui/floatpane.h'),
                                      opj(WXDIR, 'include/wx/aui/dockart.h'),
                                      opj(WXDIR, 'include/wx/aui/auibook.h'),
+                                     opj(WXDIR, 'include/wx/aui/tabmdi.h'),
                                      ])
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('aui', libdirs):
     auiLib = makeLibName('aui')
 else:
     auiLib = []
@@ -617,7 +627,7 @@ if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
     #if os.name == 'nt':
-    STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
+    STC_H = opj(WXDIR, 'include/wx/stc')
     #else:
     #    STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR))
 
@@ -646,6 +656,10 @@ if BUILD_STC:
                              opj(location, "_stc_gendocs.i"),
                              ] + swig_deps)
 
+    stcLibs = libs[:]
+    if not MONOLITHIC and findLib('stc', libdirs):
+        stcLibs += makeLibName('stc')
+
     ext = Extension('_stc',
                     swig_sources,
 
@@ -653,7 +667,7 @@ if BUILD_STC:
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + makeLibName('stc'),
+                    libraries = stcLibs,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -708,13 +722,19 @@ if BUILD_GIZMOS:
                             [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',
-                    [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
+                    [ '%s/treelistctrl.cpp'        % opj(location, 'wxCode/src'),
+                      '%s/gizmos/dynamicsash.cpp'  % opj(location, 'wxCode/src'),
+                      #'%s/gizmos/editlbox.cpp'     % opj(location, 'wxCode/src'),
+                      '%s/gizmos/ledctrl.cpp'      % opj(location, 'wxCode/src'),
+                      '%s/gizmos/splittree.cpp'    % opj(location, 'wxCode/src'),
+                      '%s/gizmos/statpict.cpp'     % opj(location, 'wxCode/src'),
+                      ] + swig_sources,
 
                     include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + makeLibName('gizmos'),
+                    libraries = libs,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -842,9 +862,11 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',
+                          'wx.lib.art',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
+                          'wx.lib.floatcanvas.Utilities',
                           'wx.lib.masked',
                           'wx.lib.mixins',
                           'wx.lib.ogl',