Replaced && with $ in bittest.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 4a9e0fa8d2f91ff3ac0a7367402a3161aa52cc57..96ecf34550d519917f84d11a9139054926cd0599 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.2b7+"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -31,10 +31,11 @@ on.
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
-BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 
+BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
+
 
 CORE_ONLY = 0      # if true, don't build any of the above
 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
@@ -216,7 +217,7 @@ if os.name == 'nt':
 
 
     if bcpp_compiling:  # overwrite it
-        cflags = ['-5', '-VF',  ### To supplort MSVC spurious semicolons in the class scope
+        cflags = ['-5', '-VF',  ### To support MSVC spurious semicolons in the class scope
                   ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
                   '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
                   '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
@@ -233,7 +234,7 @@ if os.name == 'nt':
 
 
 
-elif os.name == 'posix' and sys.platform == "darwin1":
+elif os.name == 'posix' and sys.platform[:6] == "darwin":
     # Flags and such for a Darwin (Max OS X) build of Python
 
     WXDIR = '..'              # assumes IN_CVS_TREE
@@ -773,8 +774,8 @@ if not GL_ONLY and BUILD_GIZMOS:
 
     ext = Extension('gizmosc', [
                                 '%s/dynamicsash.cpp' % GIZMOLOC,
-                                #'%s/editlbox.cpp' % GIZMOLOC,
-                                #'%s/multicell.cpp' % GIZMOLOC,
+                                '%s/editlbox.cpp' % GIZMOLOC,
+                                '%s/multicell.cpp' % GIZMOLOC,
                                 '%s/splittree.cpp' % GIZMOLOC,
                              ] + swig_sources,