Fixed a deadlock problem when using threads

Incremented version number

Added some missing methods and such

Minor updates to a couple demos


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

utils/wxPython/demo/Main.py

@@ -243,9 +243,11 @@ class wxPythonDemo(wxFrame):
 
         else:
             if os.path.exists(itemText + '.py'):
+                wxBeginBusyCursor()
                 self.GetDemoFile(itemText + '.py')
                 module = __import__(itemText, globals())
                 self.SetOverview(itemText, module.overview)
+                wxEndBusyCursor()
 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();
@@ -256,7 +258,7 @@ class wxPythonDemo(wxFrame):
                     self.nb.AddPage(self.window, 'Demo')
                     #self.nb.ResizeChildren()
                     self.nb.SetSelection(2)
-                    self.nb.ResizeChildren()
+                    #self.nb.ResizeChildren()
                     #if self.window.GetAutoLayout():
                     #    self.window.Layout()
 

utils/wxPython/demo/Sizers.py

@@ -87,6 +87,20 @@ def makeSimpleBox7(win):
 
     return box
 
+#----------------------------------------------------------------------
+
+def makeSimpleBox8(win):
+    box = wxBoxSizer(wxVERTICAL)
+    box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
+    box.Add(0,0, 1)
+    box.Add(wxButton(win, 1010, "two"), 0, wxCENTER)
+    box.Add(0,0, 1)
+    box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
+    box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
+#    box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
+
+    return box
+
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 
@@ -301,6 +315,11 @@ theTests = [
      "window or another Sizer."
      ),
 
+    ("Centering in available space", makeSimpleBox8,
+     "This one shows an item that does not expand to fill it's space, but rather"
+     "stays centered within it."
+     ),
+
 #    ("Percent Sizer", makeSimpleBox6,
 #     "You can use the wxBoxSizer like a Percent Sizer.  Just make sure that all "
 #     "the weighting factors add up to 100!"

utils/wxPython/demo/XMLtreeview.py

@@ -26,7 +26,8 @@ else:
 
         # Define a handler for start element events
         def StartElement(self, name, attrs ):
-            self.nodeStack.append(self.AppendItem(self.nodeStack[-1], name))
+            id = self.AppendItem(self.nodeStack[-1], name)
+            self.nodeStack.append(id)
 
         def EndElement(self,  name ):
             self.nodeStack = self.nodeStack[:-1]

utils/wxPython/demo/paper.xml

@@ -3,7 +3,7 @@
 <!ENTITY footprint SYSTEM "footprint.tif" NDATA tiff >
 <!ENTITY footprint SYSTEM "footprint.eps" NDATA eps >
 <!ENTITY shoes SYSTEM "shoes.tif" NDATA tiff >
-<!ENTITY super1 "&#90;"> 
+<!ENTITY super1 "&#90;">
 ]>
 
 <gcapaper><front><title>Using SGML to make footprints in the sand

utils/wxPython/demo/wxLayoutConstraints.py

@@ -3,9 +3,9 @@ from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
-class TestLayoutConstraints(wxWindow):
+class TestLayoutConstraints(wxPanel):
     def __init__(self, parent):
-        wxWindow.__init__(self, parent, -1)
+        wxPanel.__init__(self, parent, -1)
         self.SetAutoLayout(true)
         EVT_BUTTON(self, 100, self.OnButton)