fixed FromAscii() changes to correctly handle embedded NULs

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 36d8ca6ea268e80a810cfc86f771fae676d95461..d7c8adb430b3abf66827d5f628993a4f8af22b81 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/_srchctrl.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -481,7 +482,12 @@ wxpExtensions.append(ext)
 
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
-                        USE_SWIG, swig_force, swig_args, swig_deps)
+                        USE_SWIG, swig_force, swig_args,
+                        swig_deps + [ 'src/_richtextbuffer.i',
+                                      'src/_richtextctrl.i',
+                                      'src/_richtexthtml.i',
+                                      'src/_richtextxml.i',
+                                      ])
 if not MONOLITHIC and findLib('richtext', libdirs):
     richLib = makeLibName('richtext')
 else:
@@ -507,6 +513,7 @@ 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 and findLib('aui', libdirs):
     auiLib = makeLibName('aui')
@@ -567,6 +574,11 @@ if BUILD_GLCANVAS:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
 
+    if sys.platform[:6] == "darwin" and WXPORT == 'mac':
+        if not ARCH == "":
+            gl_lflags.append("-arch")
+            gl_lflags.append(ARCH)
+    
     ext = Extension('_glcanvas',
                     swig_sources,
 
@@ -625,7 +637,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))
 
@@ -654,6 +666,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,
 
@@ -661,7 +677,7 @@ if BUILD_STC:
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + makeLibName('stc'),
+                    libraries = stcLibs,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
@@ -716,13 +732,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,
@@ -854,6 +876,7 @@ if __name__ == "__main__":
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
+                          'wx.lib.floatcanvas.Utilities',
                           'wx.lib.masked',
                           'wx.lib.mixins',
                           'wx.lib.ogl',