X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/347bf0fb84e52e1cef03df02633af10c751b2248..2b0246530d08cf7724d94c70d631c166f9717c2c:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 289b58d477..27ce149bf6 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,10 +37,10 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
-VER_MINOR        = 6
+VER_MINOR        = 7
 VER_RELEASE      = 0
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = ""     # release flags, such as prerelease or RC num, etc.
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+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      = """\
@@ -87,7 +87,6 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 
                    # Internet Explorer wrapper (experimental)
-BUILD_IEWIN = 0 #(os.name == 'nt')
 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 
@@ -130,7 +129,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
@@ -242,7 +241,7 @@ WXPYTHON_TYPE_TABLE = '_wxPython_table'
 
 # Boolean (int) flags
 for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
-              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 'BUILD_IEWIN',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 
               'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
@@ -306,7 +305,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.
@@ -335,7 +334,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,
@@ -381,7 +380,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('\\'))
 
@@ -633,7 +632,6 @@ if CORE_ONLY:
     BUILD_STC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
-    BUILD_IEWIN = 0
     BUILD_ACTIVEX = 0
     BUILD_ANIMATE = 0
 
@@ -752,6 +750,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])