diff --git a/wxPython/demo/wxNotebook.py b/wxPython/demo/wxNotebook.py
index 0bd286ec22..1f46c2c6e8 100644
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/wxNotebook.py
@@ -14,7 +14,7 @@ import sys
 class TestNB(wxNotebook):
     def __init__(self, parent, id, log):
         wxNotebook.__init__(self, parent, id, style=
-                            #0
+                            #wxNB_TOP
                             wxNB_BOTTOM
                             #wxNB_LEFT
                             #wxNB_RIGHT
@@ -59,11 +59,11 @@ class TestNB(wxNotebook):
         win = self.makeColorPanel(wxCYAN)
         self.AddPage(win, "Cyan")
 
-        win = self.makeColorPanel(wxWHITE)
-        self.AddPage(win, "White")
+##         win = self.makeColorPanel(wxWHITE)
+##         self.AddPage(win, "White")
 
-        win = self.makeColorPanel(wxBLACK)
-        self.AddPage(win, "Black")
+##         win = self.makeColorPanel(wxBLACK)
+##         self.AddPage(win, "Black")
 
         win = self.makeColorPanel(wxNamedColour('MIDNIGHT BLUE'))
         self.AddPage(win, "MIDNIGHT BLUE")
diff --git a/wxPython/demo/wxSingleChoiceDialog.py b/wxPython/demo/wxSingleChoiceDialog.py
index df2d2b1b0e..aa649eb750 100644
--- a/wxPython/demo/wxSingleChoiceDialog.py
+++ b/wxPython/demo/wxSingleChoiceDialog.py
@@ -16,17 +16,17 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
-
-
-
-
 overview = """\
-This class represents a dialog that shows a list of strings, and allows the user to select one. Double-clicking on a list item is equivalent to single-clicking and then pressing OK.
+This class represents a dialog that shows a list of strings, and allows the user
+to select one. Double-clicking on a list item is equivalent to single-clicking
+and then pressing OK.
 
 """
 
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+
diff --git a/wxPython/demo/wxTreeCtrl.py b/wxPython/demo/wxTreeCtrl.py
index 9a6a24f468..5aeed4fa2f 100644
--- a/wxPython/demo/wxTreeCtrl.py
+++ b/wxPython/demo/wxTreeCtrl.py
@@ -167,7 +167,7 @@ class TestTreeCtrlPanel(wxPanel):
         event.Skip()
 
 
-    def OnActivate(self, evt):
+    def OnActivate(self, event):
         self.log.WriteText("OnActivate: %s\n" % self.tree.GetItemText(self.item))