typos fixed and more notes on some changes

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 0ff773b52a1de867cdc9b901da1b6d42b95cf54e..1628f4f375f12c50a63cd1da8b4b7cabadac5d01 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -25,6 +25,31 @@ from wxBookCtrl.
 Added Gordon Williams' PyPlot module to the library, available as the
 wx.lib.plot module.
 
 Added Gordon Williams' PyPlot module to the library, available as the
 wx.lib.plot module.
 

+I made a small but important change in the code that aquires the
+Python Global Interpreter Lock to try and prevent deadlocks that can
+happen when there are nested attempts to aquire the GIL.
+
+The RPMs will now install menu items on Mandrake in
+Applications/Development/Tools for PyCrust, XRCed, etc.  They are also
+installing icons and *.desktop items in the generic KDE and GNOME
+locations, but I don't know yet if they are resulting in menu items on
+non-Mandrake systems.  (It didn't automatically do it on my RH-9 build
+box but I didn't chase it very far...)  If you have ideas for how to
+improve the .spec file to work better and/or on more distros please
+send me a patch.
+
+The RPMs are now built on a RH-9 box, and I have tested installing
+them also on my main Mandrake 9.2 box.
+
+There are some big changes in the OS X disk image.  The actual
+Installer package now *only* installs the wxMac dynlibs, wxPython
+extension modules and pacakges, and also the command-line tool
+scripts. The remaining items (demo, samples, and application bundles
+for the Demo, PyCrust and XRCed) are now top-level items in the disk
+image (.dmg file) that users can just drag and drop to wherever they
+want to put them.
+
+

 
 
 2.4.2.4
 
 
 2.4.2.4

diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt
index aca5b30ffa1e63bb1d85932148b8f6df3aa619aa..8e5da9fe2e8b84751a7591e4c5d84fc35ff72fb3 100644 (file)
--- a/wxPython/docs/MigrationGuide.txt
+++ b/wxPython/docs/MigrationGuide.txt
@@ -361,10 +361,9 @@ For example::
 Sizers
 ------
 
 Sizers
 ------
 

-The hack allowing the old "option" keyword parameter has been
-removed.  If you use keyworkd args with wxSizer Add, Insert, or
-Prepend then you will need to use the "proportion" name instead of
-"option".  
+The hack allowing the old "option" keyword parameter has been removed.
+If you use keyworkd args with wxSizer Add, Insert, or Prepend methods
+then you will need to use the "proportion" name instead of "option".

 
 When adding a spacer to a sizer you now need to use a wxSize or a
 2-integer sequence instead of separate width and height parameters.
 
 When adding a spacer to a sizer you now need to use a wxSize or a
 2-integer sequence instead of separate width and height parameters.


@@ -387,13 +386,12 @@ into a single extension module, the "core" module is now just a few
 extensions that are linked independently, and then merged together
 later into the main namespace via Python code.
 
 extensions that are linked independently, and then merged together
 later into the main namespace via Python code.
 

-Because of the above, the "internal" module names have changed, but
-you shouldn't have been using them anyway so it shouldn't bother
-you. ;-)
+Because of the above and also because of the way the new SWIG works,
+the "internal" module names have changed, but you shouldn't have been
+using them anyway so it shouldn't bother you. ;-)

 
 

-The wxPython.help module no longer exists and the classes therein are
-now part of the core module imported with wxPython.wx or the wx
-package.
+The help module no longer exists and the classes therein are now part
+of the core module imported with wxPython.wx or the wx package.

 
 wxPyDefaultPosition and wxPyDefaultSize are gone.  Use the
 wxDefaultPosition and wxDefaultSize objects instead.
 
 wxPyDefaultPosition and wxPyDefaultSize are gone.  Use the
 wxDefaultPosition and wxDefaultSize objects instead.


@@ -414,3 +412,5 @@ wxPyTypeCast has been removed.  Since we've had the OOR (Original
 Object Return) for a couple years now there should be no need to use
 wxPyTypeCast at all.
 
 Object Return) for a couple years now there should be no need to use
 wxPyTypeCast at all.
 

+If you use the old wxPython package and wxPython.wx namespace then
+there are compatibility aliases for much of the above items.