Don't try to typedef off_t twice (eVC++)

[wxWidgets.git] / wxPython / demo / Listbook.py
diff --git a/wxPython/demo/Listbook.py b/wxPython/demo/Listbook.py

index 2186205cb3e7aae2e88fbbf3560c5ce20a54b940..cb620fe83d67569427d8d39f559506ae66fc99c8 100644 (file)
--- a/wxPython/demo/Listbook.py
+++ b/wxPython/demo/Listbook.py
@@ -1,19 +1,8 @@
-# 11/22/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 11/29/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Bunches of imports that might need to go away for the final roll-out.
-# 
-
-import  sys
  
  import  wx
  
  
  import  wx
  
-import images
-
  import ColorPanel
  import ColorPanel
+import images
  
  colourList = [ "Aquamarine", "Black", "Blue", "Blue Violet", "Brown", "Cadet Blue",
                 "Coral", "Cornflower Blue", "Cyan", "Dark Grey", "Dark Green",
  
  colourList = [ "Aquamarine", "Black", "Blue", "Blue Violet", "Brown", "Cadet Blue",
                 "Coral", "Cornflower Blue", "Cyan", "Dark Grey", "Dark Green",
@@ -45,7 +34,6 @@ class TestLB(wx.Listbook):
                              )
          self.log = log
  
                              )
          self.log = log
  
-
          # make an image list using the BlomXX images
          il = wx.ImageList(32, 32)
          for x in range(1, 15):
          # make an image list using the BlomXX images
          il = wx.ImageList(32, 32)
          for x in range(1, 15):
@@ -70,11 +58,9 @@ class TestLB(wx.Listbook):
                  #st.SetForegroundColour(wxWHITE)
                  #st.SetBackgroundColour(wxBLUE)
                  first = False
                  #st.SetForegroundColour(wxWHITE)
                  #st.SetBackgroundColour(wxBLUE)
                  first = False
-            
-                
  
  
-        wx.EVT_LISTBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged)
-        wx.EVT_LISTBOOK_PAGE_CHANGING(self, self.GetId(), self.OnPageChanging)
+        self.Bind(wx.EVT_LISTBOOK_PAGE_CHANGED, self.OnPageChanged)
+        self.Bind(wx.EVT_LISTBOOK_PAGE_CHANGING, self.OnPageChanging)
  
  
      def makeColorPanel(self, color):
  
  
      def makeColorPanel(self, color):
@@ -112,10 +98,10 @@ def runTest(frame, nb, log):
  
  overview = """\
  <html><body>
  
  overview = """\
  <html><body>
-<h2>wxListbook</h2>
+<h2>wx.Listbook</h2>
  <p>
  This class is a control similar to a notebook control, but with a
  <p>
  This class is a control similar to a notebook control, but with a
-wxListCtrl instead of a set of tabs.
+wx.ListCtrl instead of a set of tabs.
  
  """
  
  
  """
  
@@ -124,6 +110,7 @@ wxListCtrl instead of a set of tabs.
  if __name__ == '__main__':
      import sys,os
      import run
  if __name__ == '__main__':
      import sys,os
      import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
+