X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35d1a03b2779b4c0cd04f349776e29c7f25b87b..726c8204cd7f5541556291df3d3d03c18cecac7c:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index bbe0f0eb9d..851c315f89 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,7 +38,7 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
-VER_RELEASE      = 4
+VER_RELEASE      = 5
 VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
@@ -79,14 +79,14 @@ 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
-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_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
 
 
@@ -834,7 +834,7 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 # SWIG defaults
 #----------------------------------------------------------------------
 
-# i files could live in the wxWidgets/wxPython/src dir, or in 
+# *.i files could live in the wxWidgets/wxPython/src dir, or in 
 # a subdirectory of the devel package. Let's specify both 
 # dirs as includes so we don't have to guess which is correct.
  
@@ -844,12 +844,9 @@ if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
     wxfilesdir = opj(WXPY_SRC, i_subdir)
-    
+
 i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
                      '-I' + wxfilesdir ]
-                     
-if wxfilesdir != "":
-    i_files_includes.append(wxfilesdir)
 
 swig_cmd = SWIG
 swig_force = force
@@ -887,8 +884,6 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 ####################################
 
 import pprint
-import xml.sax            
-
 try:
     import libxml2
     FOUND_LIBXML2 = True