diff --git a/wxPython/demo/GridCustEditor.py b/wxPython/demo/GridCustEditor.py
index 27bba1562d..39050510f9 100644
--- a/wxPython/demo/GridCustEditor.py
+++ b/wxPython/demo/GridCustEditor.py
@@ -149,6 +149,7 @@ class MyCellEditor(wxPyGridCellEditor):
             # For this example, replace the text.  Normally we would append it.
             #self._tc.AppendText(ch)
             self._tc.SetValue(ch)
+            self._tc.SetInsertionPointEnd()
         else:
             evt.Skip()
 
diff --git a/wxPython/demo/wxCheckListBox.py b/wxPython/demo/wxCheckListBox.py
index 4a0fd024c7..fd88c3b8ef 100644
--- a/wxPython/demo/wxCheckListBox.py
+++ b/wxPython/demo/wxCheckListBox.py
@@ -22,7 +22,8 @@ class TestPanel(wxPanel):
         lb.SetSelection(0)
         self.lb = lb
 
-        btn = wxButton(self, -1, "Test SetString", (180, 50))
+        pos = lb.GetPosition().x + lb.GetSize().width + 25
+        btn = wxButton(self, -1, "Test SetString", (pos, 50))
         EVT_BUTTON(self, btn.GetId(), self.OnTestButton)
 
         EVT_RIGHT_UP(self, self.OnDoPopup)
diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/wxTextCtrl.py
index 54cf006c2d..ccc5a65880 100644
--- a/wxPython/demo/wxTextCtrl.py
+++ b/wxPython/demo/wxTextCtrl.py
@@ -68,9 +68,9 @@ class TestPanel(wxPanel):
 
 
         bsizer = wxBoxSizer(wxVERTICAL)
-        bsizer.Add(b, 0, wxGROW)
-        bsizer.Add(b2, 0, wxGROW)
-        bsizer.Add(b3, 0, wxGROW)
+        bsizer.Add(b, 0, wxGROW|wxALL, 4)
+        bsizer.Add(b2, 0, wxGROW|wxALL, 4)
+        bsizer.Add(b3, 0, wxGROW|wxALL, 4)
 
         sizer = wxFlexGridSizer(cols=3, hgap=6, vgap=6)
         sizer.AddMany([ l1, t1, (0,0),
diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index ad4bfe5ea9..ee6cdfb3c0 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -15,7 +15,7 @@ class TestToolBar(wxFrame):
 
         wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
-        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
+        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT|wxTB_TEXT)
         # wxTB_VERTICAL
         #tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
@@ -23,7 +23,8 @@ class TestToolBar(wxFrame):
 
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        #tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)