diff --git a/wxPython/config.py b/wxPython/config.py index a9f0954aaf..464330c008 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -40,7 +40,7 @@ VER_MAJOR = 2 # The first three must match wxWidgets VER_MINOR = 6 VER_RELEASE = 1 VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets -VER_FLAGS = "pre" # release flags, such as prerelease or RC num, etc. +VER_FLAGS = "" # release flags, such as prerelease or RC num, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" @@ -752,6 +752,7 @@ elif os.name == 'posix': # uncomment this block to add the right flags to the link step and build # again. ## if os.uname()[0] == 'SunOS': + ## import commands ## libs.append('gcc') ## libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1]) diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx index eb4dae3f61..c7c6fa2c91 100755 --- a/wxPython/distrib/all/build-osx +++ b/wxPython/distrib/all/build-osx @@ -37,5 +37,8 @@ if [ $skiposx != yes ]; then echo "Fetching the results..." scp "root@$host:$OSX_BUILD/wxPython*-osx*" $STAGING_DIR ssh root@$host "rm $OSX_BUILD/wxPython*-osx*" + + echo "Done!" + sleep 1 fi diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm index e95431c255..4c371a8682 100755 --- a/wxPython/distrib/all/build-rpm +++ b/wxPython/distrib/all/build-rpm @@ -95,6 +95,8 @@ if [ $skiplinux != yes ]; then ssh root@$host "/sbin/halt" sleep 10 fi + sleep 30 + + echo "Done!" fi -sleep 30 diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows index 989e4e2eba..95a946b1a3 100755 --- a/wxPython/distrib/all/build-windows +++ b/wxPython/distrib/all/build-windows @@ -30,4 +30,6 @@ if [ $skipwin != yes ]; then echo "Fetching the results..." scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*" $STAGING_DIR ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*" + + echo "Done!" fi \ No newline at end of file diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 558cce640f..ad17b9d7a0 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -514,6 +514,20 @@ Type: files; Name: "{app}\samples\wx_examples\hello\*.pyo"; Type: files; Name: "{app}\samples\wxProject\*.pyc"; Type: files; Name: "{app}\samples\wxProject\*.pyo"; +Type: files; Name: "{app}\samples\ide\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyc"; +Type: files; Name: "{app}\samples\ide\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyo"; + +Type: files; Name: "{app}\samples\docview\*.pyc"; +Type: files; Name: "{app}\samples\pydocview\*.pyc"; +Type: files; Name: "{app}\samples\docview\*.pyo"; +Type: files; Name: "{app}\samples\pydocview\*.pyo"; + ''' diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html index e48a9979bd..653b3bf064 100644 --- a/wxPython/docs/CHANGES.html +++ b/wxPython/docs/CHANGES.html @@ -11,7 +11,35 @@

Recent Changes for wxPython

-

2.6.0.1

+

2.6.1.0

+ +

wx.ListCtrl: patch #1210352, fixes editing in generic wx.ListCtrl with +wx.LC_EDIT_LABELS.

+

Applied patch #208286, MediaCtrl DirectShow rewrite.

+

DocView patches from Morgan Hua: bug fixes, and additional SVN +commands, also added a default template that uses the text editor for +any unknown file type.

+

wxMSW: Use the system IDC_HAND cursor for wx.CURSOR_HAND and only fallback +to the strange wxWidgets version if the system one is not available.

+

wx.grid.Grid: Merge the cell size attribute the same way that other +attributes are merged, e.g., if it is already set to a non-default +value in the current GridCellAttr object then don't merge from the +other.

+

wx.lib.evtmgr: Fixed to use wx._core._wxPyDeadObject

+

wx.lib.gridmovers: Don't scroll when the mouse is dragged outside of +the grid, unless the mouse is kept in motion.

+

wxMSW: Applied patch #1213290 incorrect logic in +wx.TopLevelWindow.ShowFullScreen.

+

Applied patch #1213066 correct device names for Joystick in Linux.

+

wxGTK: Applied patch #1207162 wx.TextCtrl.SetStyle fix for overlapping +calls.

+

wx.FileConfig: fixed DeleteEntry to set the dirty flag properly so the +change will get written at the next flush.

+
+
+

2.6.0.1

@@ -123,8 +151,8 @@ usual.

there is a range of allowed values (so a wx.SpinCtrl is used instead of a wx.TextCtrl.)

-
-

2.6.0.0

+
+

2.6.0.0

  • 26-Apr-2005
@@ -201,8 +229,8 @@ EVT_KEY_UP and EVT_TEXT events from its embedded text control.

-
-

2.5.5.1

+
+

2.5.5.1

  • 8-Apr-2005
@@ -270,8 +298,8 @@ list of top-level windows that currently exist in the application.

folks.

Added the ActiveGrid IDE as a sample application.

-
-

2.5.4.1

+
+

2.5.4.1

  • 16-Mar-2005
@@ -504,8 +532,8 @@ wx.Image.

-
-

2.5.3.1

+
+

2.5.3.1

  • 9-Nov-2004
@@ -661,8 +689,8 @@ it.

wxPython on OSX can now be built in Unicode mode, can support multiple version installs, and comes with an uninstaller script.

-
-

2.5.2.8

+
+

2.5.2.8

  • 27-Aug-2004
@@ -693,8 +721,8 @@ wxCheckListBox.
-
-

2.5.2.7

+
+

2.5.2.7

  • 14-Aug-2004
@@ -877,8 +905,8 @@ 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.

-
-

2.4.2.4

+
+

2.4.2.4

  • 1-Oct-2003
@@ -890,8 +918,8 @@ demonstrated in the Threads sample in the demo.

Added wxMaskedNumCtrl.

Added Chris Barker's FloatCanvas.

-
-

2.4.1.2

+
+

2.4.1.2

  • 19-Jun-2003
@@ -945,8 +973,8 @@ release,) SetItemMinSize can now take a wxSize (or 2-tuple) parameter, and Spacers can be specified with a wxSize (or 2-tuple) parameter

Added wxCursorFromBits.

-
-

2.4.0.7

+
+

2.4.0.7

  • 24-Mar-2003
@@ -985,8 +1013,8 @@ think I am testing in the future...

Updated pycolourchooser.

Updated to 0.9b of PyCrust.

-
-

2.4.0.4

+
+

2.4.0.4

  • 7-Mar-2003
@@ -1046,8 +1074,8 @@ doesn't have a standard place for them.

Fixed typemaps for wxGridCellCoordsArray.

Updated to the 0.9a version of PyCrust

-
-

2.4.0.2

+
+

2.4.0.2

  • 23-Jan-2003
@@ -1055,8 +1083,8 @@ doesn't have a standard place for them.

Added wxIntCtrl from Will Sadkin.

Added wxPyColourChooser by Michael Gilfix.

-
-

2.4.0.1

+
+

2.4.0.1

  • 10-Jan-2003
@@ -1065,15 +1093,15 @@ enhancements.

Added function wrappers for the common dialogs from Kevin Altis. See wxPython/lib/dialogs.py for more details.

-
-

2.3.4.2

+
+

2.3.4.2

  • 21-Dec-2002

Various bug fixes.

-
-

2.3.4.1

+
+

2.3.4.1

  • 18-Dec-2002
@@ -1130,8 +1158,8 @@ windows when desired.

HTMLHelp viewer does. Changed how the wxPythonDocs tarball is built and added a script to launch the doc viewer.

-
-

2.3.3.1

+
+

2.3.3.1

  • 19-Sep-2002
@@ -1276,8 +1304,8 @@ example.

Added wxPython.lib.mixins.rubberband module from Robb Shecter.

Added wxTimeCtrl from Will Sadkin.

-
-

2.3.2.1

+
+

2.3.2.1

  • 20-Dec-2001
@@ -1286,8 +1314,8 @@ well as the Python thread state. This time it works on SMP machines without barfing and is also still compatible with Python debuggers.

Added some patches from library contributors.

-
-

2.3.2

+
+

2.3.2

  • 11-Dec-2001
@@ -1372,8 +1400,8 @@ SendCommand method, but it is still quite powerful. See wxPython/contrib/dllwidget and wxPython/demo/dllwidget for more details.

-
-

2.3.1

+
+

2.3.1

  • 10-Jul-2001
@@ -1389,8 +1417,8 @@ subclass wxXmlResourceHandler, etc...

Fixed img2py to work correctly with Python 2.1.

Added enhanced wxVTKRenderWindow by Prabhu Ramachandran

-
-

2.3.0

+
+

2.3.0

  • 22-May-2001
@@ -1489,16 +1517,16 @@ please send it to me for inclusion in this package.

by having smaller functional apps to play with. They can be found in wxPython/samples.

-
-

2.2.7

+
+

2.2.7

  • 19-Jun-2001

No changes happened in the Python wrappers for this release, only changes and fixes in the wxWindows library.

-
-

2.2.5

+
+

2.2.5

  • 30-Jan-2001
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index 31d8c58fb2..a0ce033079 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -3,6 +3,7 @@ Recent Changes for wxPython 2.6.1.0 ------- +* 4-June-2005 wx.ListCtrl: patch #1210352, fixes editing in generic wx.ListCtrl with wx.LC_EDIT_LABELS. @@ -34,6 +35,8 @@ Applied patch #1213066 correct device names for Joystick in Linux. wxGTK: Applied patch #1207162 wx.TextCtrl.SetStyle fix for overlapping calls. +wx.FileConfig: fixed DeleteEntry to set the dirty flag properly so the +change will get written at the next flush.