Fix or add some DoGetBestSize's

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index f5d53215771a2e30d28400bd862334938085c965..c3a5a8a93aebd94c939727f6686789008440c85e 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -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)