regenerated

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

wxPython/docs/BUILD.html

@@ -74,16 +74,31 @@ cd bld
 ../configure --prefix=/opt/wx/2.5 \
              --with-gtk \
              --with-opengl \
-             --disable-monolithic \
              --enable-debug \
              --enable-geometry \
              --enable-sound --with-sdl \
              --enable-display \
 </pre>
 <p>On OS X of course you'll want to use --with-mac instead of
---with-gtk.  For GTK2 and unicode add:</p>
+--with-gtk.</p>
+<p><strong>NOTE</strong>: Due to a recent change there is a dependency problem in the
+multilib builds of wxWidgets on OSX, so I have switched to a
+monolithic build on that platform.  (IOW, all of the core code in
+one shared library instead of several.)  I would also expect other
+unix builds to do just fine with a monolithic library, but I havn't
+tested it in a while so your mileage may vary.  Anyway, to switch
+to the monolithic build of wxWidgets just add this configure flag:</p>
+<pre class="literal-block">
+--enable-monolithic \
+</pre>
+<p>By default GTK2 will be selected if it is on your build system.  To
+force the use of GTK 1.2.x add this flag:</p>
+<pre class="literal-block">
+--disable-gtk2 \
+</pre>
+<p>To make the wxWidgets build be Unicode enabled (strongly
+recommended if you are building with GTK2) then add:</p>
 <pre class="literal-block">
---enable-gtk2 \
 --enable-unicode \
 </pre>
 <p>Notice that I used a prefix of /opt/wx/2.5.  You can use whatever
@@ -159,10 +174,17 @@ command line to ensure your new one is used instead:</p>
 <pre class="literal-block">
 WX_CONFIG=/opt/wx/2.5/bin/wx-config
 </pre>
-<p>If you are building with GTK2 then add the following flags to the
-command line:</p>
+<p>By default setup.py will assume that you built wxWidgets to use
+GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
+this flag to the command-line:</p>
 <pre class="literal-block">
-WXPORT=gtk2 UNICODE=1
+WXPORT=gtk2 
+</pre>
+<p>If you would like to do a Unicode enabled build (all strings sent
+to or retruned from wx functions are Unicode objects) and your
+wxWidgets was built with unicode enabled then add this flag:</p>
+<pre class="literal-block">
+UNICODE=1
 </pre>
 <p>If you are wanting to have the source files regenerated with swig,
 then you need to turn on the USE_SWIG flag and optionally tell it

wxPython/docs/CHANGES.html

@@ -11,7 +11,7 @@
 <div class="document" id="recent-changes-for-wxpython">
 <h1 class="title">Recent Changes for wxPython</h1>
 <div class="section" id="id1">
-<h1><a name="id1">2.5.2.3</a></h1>
+<h1><a name="id1">2.5.2.5</a></h1>
 <p>wx.ADJUST_MINSIZE is now the default behaviour for window items in
 sizers.  This means that the item's GetMinSize and/or GetBestSize will
 be called when calculating layout and the return value from that will
@@ -86,6 +86,23 @@ in a subpackage of wx.lib.</p>
 <p>It is now possible to change the tab traversal order of controls on a
 panel or dialog.  For details see the new MoveAfterInTabOrder and
 MoveBeforeInTabOrder methods of wx.Window.</p>
+<p>Applied (and heavily modified) a patch from Eugene
+&lt;<a class="reference" href="mailto:svip123&#64;fastmail.fm">svip123&#64;fastmail.fm</a>&gt; that allows the sample modules in the demo to be
+edited and reloaded, all from within the demo.  You can switch back
+and forth between the default and your edited version, and any errors
+ocurring upon the reload are reported on the Demo tab.</p>
+<p>Added a menu item in the demo that will open a PyShell window that has
+the app and demo frame preloaded in the namespace.  This is another
+good way to explore and play with the objects in the currently running
+sample.  For example, load the Button sample and then do the following
+in the PyShell:</p>
+<pre class="literal-block">
+&gt;&gt;&gt; b = frame.demoPage.GetChildren()[0]
+&gt;&gt;&gt; for x in range(0, 500, 10):
+...     b.Move((x, 50))
+...     app.Yield(True)
+...     wx.MilliSleep(10)
+</pre>
 </div>
 <div class="section" id="id2">
 <h1><a name="id2">2.5.1.5</a></h1>