Don't build the old versions of OGL or iewin by default anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 9dc2e5922d2e290fde381e094aa275647e8a45c6..67da2efe76697f0fd220e2ae98ddc1df533f3dea 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3576,7 +3576,7 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
     if ( id == 0 && pDrawStruct->CtlType == ODT_MENU )
     {
         wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
-
+        if (!pMenuItem) return false;
         wxCHECK_MSG( pMenuItem && pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)),
                          false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 

diff --git a/wxPython/config.py b/wxPython/config.py
index 6a93443a3bf5e80cdda3840a963910498510d60d..485564b04915f2afd577d886d83d7099706d0f35 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -40,7 +40,7 @@ VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 4
 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        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -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
 
 

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 1e917eb165eaebef9c66e7f3059e77e96e2dbea5..7a60b2f674c435b4bb6cdabbcf04f21c0dcc4836 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -89,9 +89,9 @@ Source: "wx\_html.pyd";                        DestDir: "{app}\%(PKGDIR)s\wx"; C
 Source: "wx\_wizard.pyd";                      DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_gizmos.pyd";                      DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_glcanvas.pyd";                    DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
-Source: "wx\_iewin.pyd";                       DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
+;;Source: "wx\_iewin.pyd";                       DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_activex.pyd";                     DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
-Source: "wx\_ogl.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
+;;Source: "wx\_ogl.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_stc.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_xrc.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 
@@ -390,7 +390,7 @@ Source: "demo\data\*.swf";                  DestDir: "{app}\demo\data";
 
 Source: "licence\*.txt";                    DestDir: "{app}\docs\licence"; 
 Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\docs"; 
-Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\docs"; 
+;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\docs"; 
 Source: "docs\README.txt";                  DestDir: "{app}\docs";  Flags: isreadme; 
 Source: "docs\*.txt";                       DestDir: "{app}\docs"; 
 Source: "docs\*.css";                       DestDir: "{app}\docs"; 

diff --git a/wxPython/distrib/msw/.make b/wxPython/distrib/msw/.make
index 02c05932175d110310c17d732ee2447e22f6d19e..24de48c035fa8eb4c4153411854fd7985eb0c4c9 100644 (file)
--- a/wxPython/distrib/msw/.make
+++ b/wxPython/distrib/msw/.make
@@ -115,12 +115,12 @@ if [ ! $? = 0 ]; then error; fi
 cd -
 
 
-echo ------------------
-echo cd ../../contrib/build/ogl
-cd ../../contrib/build/ogl
-$WXWIN/build/msw/.mymake $BUILD_TYPE CPPFLAGS="-DwxUSE_DEPRECATED=0" $@
-if [ ! $? = 0 ]; then error; fi
-cd -
+# echo ------------------
+# echo cd ../../contrib/build/ogl
+# cd ../../contrib/build/ogl
+# $WXWIN/build/msw/.mymake $BUILD_TYPE CPPFLAGS="-DwxUSE_DEPRECATED=0" $@
+# if [ ! $? = 0 ]; then error; fi
+# cd -
 
 
 

diff --git a/wxPython/distrib/msw/.make.btm b/wxPython/distrib/msw/.make.btm
index 23911f54c3bf56b827ac2cf4099415bceb2d9833..1137b077388794850ac26ba533f21eb249b1e385 100644 (file)
--- a/wxPython/distrib/msw/.make.btm
+++ b/wxPython/distrib/msw/.make.btm
@@ -100,12 +100,12 @@ if %? != 0 goto done
 cd -
 
 
-echo ------------------
-echo cd ..\..\contrib\build\ogl
-cd ..\..\contrib\build\ogl
-call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% CXX="cl -DwxUSE_DEPRECATED=0" %$
-if %? != 0 goto done
-cd -
+REM echo ------------------
+REM echo cd ..\..\contrib\build\ogl
+REM cd ..\..\contrib\build\ogl
+REM call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% CXX="cl -DwxUSE_DEPRECATED=0" %$
+REM if %? != 0 goto done
+REM cd -
 
 
 

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 3602e2e735b8f65cdc5f7a6c0c4a0386be1f5180..f127561f61c6fc63674d463b25de58b0af0e8654 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -246,6 +246,12 @@ lead.  Boa needs them to help keep track of what kind of item is being
 managed by the sizer.  They are now just simple compatibility aliases
 for Add, and etc.
 
+The old C++ version of the OGL lib is no longer built by default.  Use
+the Python version in the wx.lib.ogl package instead.
+
+The wx.iewin module is no longer built by default.  You can use the
+wx.lib.iewin version instead.
+