diff --git a/wxPython/demo/FontEnumerator.py b/wxPython/demo/FontEnumerator.py
index 67b5f6ef10..3ac7e51d4a 100644
--- a/wxPython/demo/FontEnumerator.py
+++ b/wxPython/demo/FontEnumerator.py
@@ -24,7 +24,7 @@ class TestPanel(wxPanel):
         row = wxBoxSizer(wxHORIZONTAL)
         row.Add(s1, 0, wxALL, 5)
         row.Add(self.lb1, 0, wxALL, 5)
-        row.Add(self.txt, 0, wxALL, 5)
+        row.Add(self.txt, 0, wxALL|wxADJUST_MINSIZE, 5)
 
         sizer = wxBoxSizer(wxVERTICAL)
         sizer.Add(row, 0, wxALL, 30)
@@ -32,13 +32,27 @@ class TestPanel(wxPanel):
         self.Layout()
 
         self.lb1.SetSelection(0)
+        self.OnSelect(None)
+        wxFutureCall(300, self.SetTextSize)
+
+
+    def SetTextSize(self):
+        self.txt.SetSize(self.txt.GetBestSize())
 
 
     def OnSelect(self, evt):
+        #print "OnSelect: "
         face = self.lb1.GetStringSelection()
+        #print '\t '+face
         font = wxFont(28, wxDEFAULT, wxNORMAL, wxNORMAL, False, face)
+        #print "\t got font"
+        self.txt.SetLabel(face)
+        #print "\t set label"
         self.txt.SetFont(font)
-        self.txt.SetSize(self.txt.GetBestSize())
+        #print "\t set font"
+        #self.txt.SetSize(self.txt.GetBestSize())
+        #print "\t set size"
+
 
 ##         st = font.GetNativeFontInfo().ToString()
 ##         ni2 = wxNativeFontInfo()
diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index 89c2ec6e07..267867c434 100644
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -64,6 +64,11 @@ class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):
         self.SetCellValue(11, 1, "This cell is set to span 3 rows and 3 columns");
 
 
+        editor = wxGridCellTextEditor()
+        editor.SetParameters('10')
+        self.SetCellEditor(0, 4, editor)
+        self.SetCellValue(0, 4, "Limited text")
+
 
         # test all the events
         EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)
diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/wxStaticText.py
index 39b6287d67..c40d886405 100644
--- a/wxPython/demo/wxStaticText.py
+++ b/wxPython/demo/wxStaticText.py
@@ -26,7 +26,7 @@ class TestPanel(wxPanel):
         text = wxStaticText(self, -1, str, (20, 100))
         font = wxFont(18, wxSWISS, wxNORMAL, wxNORMAL)
         text.SetFont(font)
-        text.SetSize(text.GetBestSize())
+        #text.SetSize(text.GetBestSize())
 
         wxStaticText(self, -1, "Multi-line wxStaticText\nline 2\nline 3\n\nafter empty line", (20,150))
         wxStaticText(self, -1, "Align right multi-line\nline 2\nline 3\n\nafter empty line", (220,150), style=wxALIGN_RIGHT)
diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/wxTreeCtrl.py
index 9130b19c97..9a6a24f468 100644
--- a/wxPython/demo/wxTreeCtrl.py
+++ b/wxPython/demo/wxTreeCtrl.py
@@ -29,8 +29,8 @@ class TestTreeCtrlPanel(wxPanel):
         self.log = log
         tID = wxNewId()
 
-        self.tree = MyTreeCtrl(self, tID,
-                               style = wxTR_HAS_BUTTONS
+        self.tree = MyTreeCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
+                               wxTR_HAS_BUTTONS
                                | wxTR_EDIT_LABELS
                                #| wxTR_MULTIPLE
                                #| wxTR_HIDE_ROOT