Fix or add some DoGetBestSize's

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index ebb73a141a427b2d8a8bd22a587d7786a3ae3d90..c3a5a8a93aebd94c939727f6686789008440c85e 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,8 +38,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 1
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 1

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


@@ -87,7 +87,7 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
 
                    # Internet Explorer wrapper (experimental)
 BUILD_IEWIN = (os.name == 'nt')
 
                    # Internet Explorer wrapper (experimental)
 BUILD_IEWIN = (os.name == 'nt')

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

 
 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 
 CORE_ONLY = 0      # if true, don't build any of the above


@@ -408,7 +408,7 @@ class wx_install_headers(distutils.command.install_headers.install_headers):
             return
 
         root = self.root
             return
 
         root = self.root

-        if WXPREFIX.startswith(root):
+        if root is None or WXPREFIX.startswith(root):

             root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root + WXPREFIX + location)
             root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root + WXPREFIX + location)