made (many) more wxGrid methods const

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index c9dfc483ea5c7d096a9d4ca8f46e6284bb232a77..6413627345be67357aa72d377263aec000ee9021 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -289,6 +289,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_hyperlink.i',
                           'src/_picker.i',
                           'src/_collpane.i',
                           'src/_hyperlink.i',
                           'src/_picker.i',
                           'src/_collpane.i',

+                          'src/_srchctrl.i',

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


@@ -361,6 +362,20 @@ ext = Extension('_calendar', swig_sources,
 wxpExtensions.append(ext)
 
 
 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,
 swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_grid', swig_sources,


@@ -391,7 +406,7 @@ wxpExtensions.append(ext)
 
 
 mediaLibs = libs[:]
 
 
 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)
     mediaLibs += makeLibName('media')
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)


@@ -445,7 +460,8 @@ swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])

-if not MONOLITHIC:
+
+if not MONOLITHIC and findLib('xrc', libdirs):

     xrcLib = makeLibName('xrc')
 else:
     xrcLib = []
     xrcLib = makeLibName('xrc')
 else:
     xrcLib = []


@@ -467,7 +483,7 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 
 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 = []
     richLib = makeLibName('richtext')
 else:
     richLib = []


@@ -492,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/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 = []
     auiLib = makeLibName('aui')
 else:
     auiLib = []


@@ -835,6 +852,7 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',

+                          'wx.lib.art',

                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',