X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbc916e23cee339de95a14f63c6b17f68802d0ba..9d8b1d2f3e70a151591e7b472991bceeef07f32a:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 1e4dbfb958..73773acac7 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,9 +38,9 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 6
-VER_RELEASE      = 0
+VER_RELEASE      = 1
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "pre"     # release flags, such as prerelease or RC num, etc.
+VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -55,8 +55,8 @@ LONG_DESCRIPTION = """\
 wxPython is a GUI toolkit for Python that is a wrapper around the
 wxWidgets C++ GUI library.  wxPython provides a large variety of
 window types and controls, all implemented with a native look and
-feel (by using the native widgets) on the platforms it is supported
-on.
+feel (by using the native widgets) on the platforms upon which it is
+supported.
 """
 
 CLASSIFIERS      = """\
@@ -130,7 +130,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
                    # created that adds that dir to the sys.path.  In
                    # addition, a wxselect.py module will be installed
                    # to site-pacakges that will allow applications to
-                   # choose a specific version if more than one are
+                   # choose a specific version if more than one is
                    # installed.
                    
 FLAVOUR = ""       # Optional flavour string to be appended to VERSION
@@ -241,8 +241,9 @@ WXPYTHON_TYPE_TABLE = '_wxPython_table'
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 'BUILD_IEWIN',
+              'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
@@ -305,7 +306,7 @@ except:
 
 def Verify_WX_CONFIG():
     """ Called below for the builds that need wx-config, if WX_CONFIG
-        is not set then determins the flags needed based on build
+        is not set then determines the flags needed based on build
         options and searches for wx-config on the PATH.  
     """
     # if WX_CONFIG hasn't been set to an explicit value then construct one.
@@ -334,7 +335,7 @@ def Verify_WX_CONFIG():
             msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")
             # should we exit?
 
-        # TODO:  exeucte WX_CONFIG --list and verify a matching config is found
+        # TODO:  execute WX_CONFIG --list and verify a matching config is found
         
 
 def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
@@ -380,7 +381,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
                     pass
 
             if force or newer(i_file, py_file) or newer(i_file, cpp_file):
-                ## we need forward slashes here even on win32
+                ## we need forward slashes here, even on win32
                 #cpp_file = opj(cpp_file) #'/'.join(cpp_file.split('\\'))
                 #i_file = opj(i_file)     #'/'.join(i_file.split('\\'))
 
@@ -751,6 +752,7 @@ elif os.name == 'posix':
     # uncomment this block to add the right flags to the link step and build
     # again.
     ## if os.uname()[0] == 'SunOS':
+    ##     import commands
     ##     libs.append('gcc')
     ##     libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])