diff --git a/wxPython/config.py b/wxPython/config.py index 937fdf189c..38a4abf14d 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 = 1 -VER_SUBREL = 3 # wxPython release num for x.y.z release of wxWidgets +VER_SUBREL = 4 # wxPython release num for x.y.z release of wxWidgets VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html index 925281bb3c..ca50576037 100644 --- a/wxPython/docs/CHANGES.html +++ b/wxPython/docs/CHANGES.html @@ -4,14 +4,14 @@
-(See also the MigrationGuide.txt file for details about some of the big changes that have happened in this release and how you should adapt your code.)
@@ -90,6 +90,7 @@ couldn't figure out anything better. Well now we have something that, if it isn't already, has the potential to be better. So consider migrating away from using activexwrapper as well. Please see the MigrationGuide for more details on using the new module. +Floats are allowed again as function parameters where ints are expected.