setting an empty region shouldn't clear the clipping

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 6a93443a3bf5e80cdda3840a963910498510d60d..3d3e6aafd2bb51f83874646e5d3a3cc9b85c80a5 100644 (file)
--- 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        = 5
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5

-VER_RELEASE      = 4
+VER_RELEASE      = 5

 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets

-VER_FLAGS        = "rc1"     # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.

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


@@ -79,14 +79,15 @@ Topic :: Software Development :: User Interfaces
 # Config values below this point can be reset on the setup.py command line.
 
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 # Config values below this point can be reset on the setup.py command line.
 
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module

-BUILD_OGL = 1      # If true, build the contrib/ogl 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_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.
 
                    # Internet Explorer wrapper (experimental)
 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 = (os.name == 'nt')
+BUILD_IEWIN = 0 #(os.name == 'nt')

 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 
 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 


@@ -884,8 +885,6 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 ####################################
 
 import pprint
 ####################################
 
 import pprint

-import xml.sax            
-

 try:
     import libxml2
     FOUND_LIBXML2 = True
 try:
     import libxml2
     FOUND_LIBXML2 = True