fix TestGLCanvas ctor (part of patch 1155132)

[wxWidgets.git] / wxPython / docs / MigrationGuide.html

diff --git a/wxPython/docs/MigrationGuide.html b/wxPython/docs/MigrationGuide.html
index b5add6b86fa4c33f7151fb1ed79941d978473399..62d63a669bd7555ca7db2613a9ae5cee582a31ea 100644 (file)
--- a/wxPython/docs/MigrationGuide.html
+++ b/wxPython/docs/MigrationGuide.html
@@ -377,7 +377,10 @@ be used from XRC.</p>
 Insert, Prepend, and etc.) methods any longer.  Just use Add and the
 wrappers will figure out what to do.  <strong>[Changed in 2.5.2.x]</strong>
 AddWindow, AddSizer, AddSpacer and etc. will now issue a
-DeprecationWarning.</p>
+DeprecationWarning. <strong>[Changed in 2.5.4.x]</strong> These methods have now
+been undeprecated at the request of Riaan Booysen, the Boa Constructor
+team lead.  They are now just simple compatibility aliases for Add,
+and etc.</p>
 <p><strong>[Changed in 2.5.2.x]</strong> The Sizers have had some fundamental internal
 changes in the 2.5.2.x release intended to make them do more of the
 &quot;Right Thing&quot; but also be as backwards compatible as possible.
@@ -765,11 +768,11 @@ directly in site-packages.  This is done to help facilitate having
 multiple versions of wxPython installed side-by-side.  Why would you
 want to do this?  One possible scenario is you have an app that
 requires wxPython 2.4 but you want to use the newest 2.5 to do your
-development with.  Or perhaps you want to be able to test your app
+own development with.  Or perhaps you want to be able to test your app
 with several different versions of wxPython to ensure compatibility.
 Before everyone panics, rest asured that if you only install one
-version of wxPython then you should notice no difference in how
-things work.</p>
+version of wxPython then you should notice no difference in how things
+work.</p>
 <p>In addition to installing wxPython into a &quot;versioned&quot; subdirectory of
 site-packages, a file named <cite>wx.pth</cite> is optionally installed that will
 contain the name of the versioned subdirectory.  This will cause that
@@ -788,10 +791,10 @@ runtime so your applications can select which version of wxPython they
 would like to to have imported.  You use it like this:</p>
 <pre class="literal-block">
 import wxversion
-wxversion.require(&quot;2.4&quot;)
+wxversion.select(&quot;2.4&quot;)
 import wx
 </pre>
-<p>Then eventhough a 2.5 version of wxPython may be the default the
+<p>Then even though a 2.5 version of wxPython may be the default the
 application that does the above the first time that wx is imported
 will actually get a 2.4 version.  <strong>NOTE:</strong> There isn't actually a 2.4
 version of wxPython that supports this, but there will be.</p>