bump subrelease number

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

diff --git a/configure b/configure
index 8523ecfeaf44af88936777062c41700bf9314aa1..0a55def23aa8a4c4babf7fe2e9d4a9a86892612c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1799,7 +1799,7 @@ test -n "$target_alias" &&
 wx_major_version_number=2
 wx_minor_version_number=7
 wx_release_number=1
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number

diff --git a/configure.in b/configure.in
index 02c5e1788dc18a02428da7ab7dc92eb43aa4694b..38a18b2e7a50b2042e276f81bcd832f0b566baeb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,7 +35,7 @@ dnl wx_release_number += 1
 wx_major_version_number=2
 wx_minor_version_number=7
 wx_release_number=1
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number

diff --git a/include/wx/version.h b/include/wx/version.h
index c4c0b9d842c565e1e76327b5807aeac746a0ab0a..543868cd88e782b94e34f94e8f0eb8ca815827e4 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -29,7 +29,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      7
 #define wxRELEASE_NUMBER     1
-#define wxSUBRELEASE_NUMBER  1
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.7.1")
 
 /*  nothing to update below this line when updating the version */

diff --git a/wxPython/config.py b/wxPython/config.py
index 0480a777d41130d0edcaae46aec75d733e8e070e..2fcb0a5f4a63afb39e01278369a9bdade7037834 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,7 +39,7 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 7
 VER_RELEASE      = 1
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = ""  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
@@ -860,7 +860,7 @@ if UNICODE:
 
 if os.path.exists('DAILY_BUILD'):
     
-    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
+    VER_FLAGS += '-' + open('DAILY_BUILD').read().strip()
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 538c4627ae872e183f0992bb51eb23653bb4352c..30bd319aafb84556ebc0f1750e027d8e7e0542dc 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -1,6 +1,37 @@
 Recent Changes for wxPython
 =====================================================================
 
+2.7.1.2
+-------
+* 20-Oct-2006
+
+Fixed a bug in the MaskedEdit controls caused by conflicting IsEmpty
+methods. 
+
+Patch #1579280: Some mimetype optimizations on unix-like systems.
+
+wxMac: Several wx.webkit.WebKitCtrl enhancements/fixes, including:
+
+    - new methods for increasing/decreasing text size, getting
+      selection, getting/setting scroll position, printing, enabling
+      editing, and running JavaScripts on the page.
+
+    - added new event (wx.webkit.WebKitBeforeLoadEvent) for catching, and
+      possibly vetoing, load events before they occur.
+
+    - wx.webkit.WebKitCtrl now fires mouse events for certain events
+      that it was eating before. This improves wxSplitterWindow
+      resizing behavior.
+
+    - refactoring of the sizing logic to move the Cocoa view.  Tested
+      with splitter windows, panels, notebooks and all position
+      correctly with this.
+
+
+
+
+
+
 2.7.1.1
 -------
 * 18-Oct-2006
@@ -67,7 +98,6 @@ Or like this with super()::
        # do something here
        return super(MyPrintout, self).OnBeginDocument(start, end)
 
-
 Note that the old way with the "base_*" function still works, but you
 will get a DeprecationWarning from calling base_OnBeginDocument.  The
 classes affected by this are:
@@ -123,7 +153,7 @@ of the component data objects to use to access the data.
 Changed how the stock objects (wx.RED, wx.RED_PEN, wx.RED_BRUSH, etc.)
 are initialized.  They are now created as uninitialized instances
 using __new__.  Then after the wx.App has been created, but before
-OnInit is called, the .this attribute of each obhect is initialized.
+OnInit is called, the .this attribute of each object is initialized.
 This was needed because of some delayed initialization functionality
 that was implemented in wxWidgets, but the end result is cleaner for
 wxPython as well, and allowed me to remove some ugly code previously
@@ -267,7 +297,7 @@ Renamed wx.FutureCall to wx.CallLater so it is named more like
 wx.CallAfter.  wx.FutureCall is now an empty subclass of wx.CallLater
 for compatibility of older code.
 
-Added the wx.lib.customtreectrl the from Andrea Gavana.
+Added the wx.lib.customtreectrl module from Andrea Gavana.
 
 Added ChangeSelection to wx.BookCtrl (the base class for wx.Notebook
 and other book controls) that is the same as SetSelection but doesn't