typo

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

diff --git a/wxPython/docs/MigrationGuide.html b/wxPython/docs/MigrationGuide.html
index d6b33f9cf1ceb0add0783417705b40e2ad37a069..e4a6f1b3f84e6676c2cfc063d0328d7b20a36549 100644 (file)
--- a/wxPython/docs/MigrationGuide.html
+++ b/wxPython/docs/MigrationGuide.html
@@ -260,13 +260,14 @@ SetClippingRegion(point, size)
 SetClippingRect(rect)
 SetClippingRegionAsRegion(region);
 </pre>
-<p>If you have code that draws on a DC you <strong>will</strong> get errors because of
-these changes, but it should be easy to fix the code.  You can either
-change the name of the <em>Type B</em> method called to the names shown
-above, or just add parentheses around the parameters as needed to turn
-them into tuples and let the SWIG typemaps turn them into the wx.Point
-or wx.Size object that is expected.  Then you will be calling the new
-<em>Type A</em> method.  For example, if you had this code before:</p>
+<p>If you have code that draws on a DC and you are using the new wx
+namespace then you <strong>will</strong> get errors because of these changes, but
+it should be easy to fix the code.  You can either change the name of
+the <em>Type B</em> method called to the names shown above, or just add
+parentheses around the parameters as needed to turn them into tuples
+and let the SWIG typemaps turn them into the wx.Point or wx.Size
+object that is expected.  Then you will be calling the new <em>Type A</em>
+method.  For example, if you had this code before:</p>
 <pre class="literal-block">
 dc.DrawRectangle(x, y, width, height)
 </pre>
@@ -284,6 +285,14 @@ dc.DrawRectangle(p.x, p.y, s.width, s.height)
 <pre class="literal-block">
 dc.DrawRectangle(p, s)
 </pre>
+<p>Now before you start yelling and screaming at me for breaking all your
+code, take note that I said above &quot;...using the new wx namespace...&quot;
+That's because if you are still importing from wxPython.wx then there
+are some classes defined there with Draw and etc. methods that have
+2.4 compatible signatures.  However if/when the old wxPython.wx
+namespace is removed then these classes will be removed too so you
+should plan on migrating to the new namespace and new DC Draw methods
+before that time.</p>
 </div>
 <div class="section" id="building-extending-and-embedding-wxpython">
 <h1><a name="building-extending-and-embedding-wxpython">Building, Extending and Embedding wxPython</a></h1>
@@ -364,7 +373,7 @@ wxPyTypeCast at all.</p>
 <hr class="footer" />
 <div class="footer">
 <a class="reference" href="MigrationGuide.txt">View document source</a>.
-Generated on: 2003-12-23 21:34 UTC.
+Generated on: 2004-01-13 20:47 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>

diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt
index bb274019e02feac7d47f2dbe33c399760198d9f3..aca5b30ffa1e63bb1d85932148b8f6df3aa619aa 100644 (file)
--- a/wxPython/docs/MigrationGuide.txt
+++ b/wxPython/docs/MigrationGuide.txt
@@ -312,7 +312,7 @@ That's because if you are still importing from wxPython.wx then there
 are some classes defined there with Draw and etc. methods that have
 2.4 compatible signatures.  However if/when the old wxPython.wx
 namespace is removed then these classes will be removed too so you
-should plam on migrating to the new namespace and new DC Draw methods
+should plan on migrating to the new namespace and new DC Draw methods
 before that time.