[start of] a wxUniversal implementation of wxToolBar

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index a8a33083638da8f9f0db40bd223a3c344a0ced81..4d4f531992c6c5db3a583388dd13c1f3ccc056d5 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.3rc"
+VERSION          = "2.3.3pre"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -33,7 +33,8 @@ BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
-BUILD_DLLWIDGET = 1# Build a module for the gizmos contrib library
+BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
+                   # to be loaded from a DLL to be used from Python.
 
 BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 
@@ -218,7 +219,9 @@ if os.name == 'nt':
             'advapi32', 'wsock32']
 
 
-    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC on some machines
+    cflags = [
+             # '/GX-'  # workaround for internal compiler error in MSVC on some machines
+             ]
     lflags = None
 
 
@@ -323,8 +326,7 @@ if not GL_ONLY:
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
                    'printfw.i', 'sizers.i', 'clip_dnd.i',
-                   'filesys.i', 'streams.i',
-                   ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
+                   'filesys.i', 'streams.i', 'utils.i'
                    ]
 
     swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
@@ -390,20 +392,6 @@ if not GL_ONLY:
     wxpExtensions.append(ext)
 
 
-    # Extension for the utils module
-    swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('utilsc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
-
-
     # Extension for the calendar module
     swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)