tab sizing and split sizing fixes

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index dace5b5cce62aea1a392ef8a182dceb3854bb924..5a00a2179f891da54ef418fe917631b1db9956dc 100644 (file)
--- 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_MAJOR        = 2      # The first three must match wxWidgets

-VER_MINOR        = 7
-VER_RELEASE      = 1
+VER_MINOR        = 8
+VER_RELEASE      = 0

 VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
 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.
+VER_FLAGS        = ""  # release flags, such as prerelease or RC num, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -82,7 +82,6 @@ BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 0      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_OGL = 0      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library

-BUILD_ANIMATE = 1  # Build a module for the animate contrib library

 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 
 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 


@@ -255,7 +254,7 @@ WXPYTHON_TYPE_TABLE = '_wxPython_table'
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
 #----------------------------------------------------------------------
 
 # Boolean (int) flags

-for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_DLLWIDGET',

               'BUILD_GIZMOS', 'BUILD_GLCANVAS', 
               'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
               'BUILD_GIZMOS', 'BUILD_GLCANVAS', 
               'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',


@@ -629,7 +628,6 @@ if CORE_ONLY:
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_ACTIVEX = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_ACTIVEX = 0

-    BUILD_ANIMATE = 0

 
 if debug:
     FINAL  = 0
 
 if debug:
     FINAL  = 0


@@ -862,7 +860,7 @@ if UNICODE:
 
 if os.path.exists('DAILY_BUILD'):
     
 
 if os.path.exists('DAILY_BUILD'):
     

-    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
+    VER_FLAGS += '-' + open('DAILY_BUILD').read().strip()

 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)