don't use EM_STREAMIN at all in Unicode mode, it's not needed

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index abcae25aa699ca644a4a2ee25b32fd55ffccc77b..278a4bc272a099981d12a0a6164d0068ea5101d0 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2b7+"
+VERSION          = "2.3.2+"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -141,6 +141,9 @@ if CORE_ONLY:
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
+    BUILD_GIZMOS = 0
+    BUILD_DLLWIDGET = 0
+
 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
@@ -778,8 +781,9 @@ if not GL_ONLY and BUILD_GIZMOS:
     ext = Extension('gizmosc', [
                                 '%s/dynamicsash.cpp' % GIZMOLOC,
                                 '%s/editlbox.cpp' % GIZMOLOC,
-                                '%s/multicell.cpp' % GIZMOLOC,
+                                #'%s/multicell.cpp' % GIZMOLOC,
                                 '%s/splittree.cpp' % GIZMOLOC,
+                                '%s/ledctrl.cpp'   % GIZMOLOC,
                              ] + swig_sources,
 
                     include_dirs =  gizmos_includes,
@@ -848,7 +852,8 @@ if __name__ == "__main__":
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',
-                          PKGDIR+'.lib.mixins'
+                          PKGDIR+'.lib.mixins',
+                          PKGDIR+'.lib.PyCrust',
                           ],
 
               ext_package = PKGDIR,