Applied toolbar patch for wxTB_RIGHT support (patch #1595081).

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 7710b73271f9be78ef264ee16ff0463ce9dd7b18..c9dfc483ea5c7d096a9d4ca8f46e6284bb232a77 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -189,10 +189,11 @@ 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',
+                         'src/_overlay.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
@@ -231,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',
@@ -265,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',
@@ -291,6 +288,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_datectrl.i',
                           'src/_hyperlink.i',
                           'src/_picker.i',
+                          'src/_collpane.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -310,9 +308,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',
@@ -331,6 +327,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,
@@ -442,8 +439,7 @@ 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',
@@ -513,6 +509,23 @@ ext = Extension('_aui', swig_sources,
 wxpExtensions.append(ext)
 
 
+swig_sources = run_swig(['animate.i'], 'src', GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_animate',
+                swig_sources,
+                
+                include_dirs =  includes + CONTRIBS_INC,
+                define_macros = defines,
+                
+                library_dirs = libdirs,
+                libraries = libs,
+
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                )
+
+wxpExtensions.append(ext)
+
 
 
 
@@ -684,7 +697,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,
@@ -702,34 +716,6 @@ if BUILD_GIZMOS:
     wxpExtensions.append(ext)
 
 
-#----------------------------------------------------------------------
-# Define the ANIMATE  extension module
-#----------------------------------------------------------------------
-
-if BUILD_ANIMATE:
-    msg('Preparing ANIMATE...')
-    location = 'contrib/animate'
-
-    swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-
-    ext = Extension('_animate',
-                    swig_sources,
-
-                    include_dirs =  includes + CONTRIBS_INC,
-                    define_macros = defines,
-
-                    library_dirs = libdirs,
-                    libraries = libs + makeLibName('animate'),
-
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-
-    wxpExtensions.append(ext)
-
-
-
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------
@@ -800,6 +786,8 @@ else:
     i_files = glob.glob(opj("src/*.i"))   + \
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
+    if BUILD_GLCANVAS:
+        i_files += glob.glob(opj("contrib/glcanvas/*.i"))
 
     HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
               zip(i_files, ["/wxPython/i_files"]*len(i_files))