X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f0f3b0fd63ba9e0b1dfa5fb8954bc659d91f122..19ab38e730bcd5d900b87a73150ce52947e05d9c:/wxPython/demo/wxListbook.py

diff --git a/wxPython/demo/wxListbook.py b/wxPython/demo/wxListbook.py
index c8b7958a82..f7be7ba1d5 100644
--- a/wxPython/demo/wxListbook.py
+++ b/wxPython/demo/wxListbook.py
@@ -1,20 +1,39 @@
-
-from   wxPython.wx import *
-
-import ColorPanel
-import GridSimple
-import wxListCtrl
-import wxScrolledWindow
-import images
-
-import sys
+# 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
+
+colourList = [ "Aquamarine", "Black", "Blue", "Blue Violet", "Brown", "Cadet Blue",
+               "Coral", "Cornflower Blue", "Cyan", "Dark Grey", "Dark Green",
+               "Dark Olive Green", "Dark Orchid", "Dark Slate Blue",
+               "Dark Slate Grey", "Dark Turquoise", "Dim Grey", "Firebrick",
+               "Forest Green", "Gold", "Goldenrod", "Grey", "Green", "Green Yellow",
+               "Indian Red", "Khaki", "Light Blue", "Light Grey", "Light Steel Blue",
+               "Lime Green", "Magenta", "Maroon", "Medium Aquamarine", "Medium Blue",
+               "Medium Forest Green", "Medium Goldenrod", "Medium Orchid",
+               "Medium Sea Green", "Medium Slate Blue", "Medium Spring Green",
+               "Medium Turquoise", "Medium Violet Red", "Midnight Blue", "Navy",
+               "Orange", "Orange Red", "Orchid", "Pale Green", "Pink", "Plum",
+               "Purple", "Red", "Salmon", "Sea Green", "Sienna", "Sky Blue",
+               "Slate Blue", "Spring Green", "Steel Blue", "Tan", "Thistle",
+               "Turquoise", "Violet", "Violet Red", "Wheat", "White", "Yellow",
+               "Yellow Green"
+               ]
 
 #----------------------------------------------------------------------------
 
-class TestLB(wxListbook):
+class TestLB(wx.Listbook):
     def __init__(self, parent, id, log):
-        wxListbook.__init__(self, parent, id, style=
-                            wxLB_DEFAULT
+        wx.Listbook.__init__(self, parent, id, style=
+                            wx.LB_DEFAULT
                             #wxLB_TOP
                             #wxLB_BOTTOM
                             #wxLB_LEFT
@@ -22,67 +41,45 @@ class TestLB(wxListbook):
                             )
         self.log = log
 
-        win = self.makeColorPanel(wxBLUE)
-        self.AddPage(win, "Blue")
-        st = wxStaticText(win.win, -1,
-                          "You can put nearly any type of window here,\n"
-                          "and if the platform supports it then the\n"
-                          "tabs can be on any side of the notebook.",
-                          wxPoint(10, 10))
-        st.SetForegroundColour(wxWHITE)
-        st.SetBackgroundColour(wxBLUE)
 
-        # Show how to put an image on one of the notebook tabs,
-        # first make the image list:
-        il = wxImageList(16, 16)
-        idx1 = il.Add(images.getSmilesBitmap())
+        # make an image list using the BlomXX images
+        il = wxImageList(32, 32)
+        for x in range(1, 15):
+            f = getattr(images, 'getBlom%02dBitmap' % x)
+            bmp = f()
+            il.Add(bmp)
         self.AssignImageList(il)
 
-        # now put an image on the first tab we just created:
-        self.SetPageImage(0, idx1)
-
-
-        win = self.makeColorPanel(wxRED)
-        self.AddPage(win, "Red")
-
-        win = wxScrolledWindow.MyCanvas(self)
-        self.AddPage(win, 'ScrolledWindow')
-
-        win = self.makeColorPanel(wxGREEN)
-        self.AddPage(win, "Green")
-
-        win = GridSimple.SimpleGrid(self, log)
-        self.AddPage(win, "Grid")
-
-        win = wxListCtrl.TestListCtrlPanel(self, log)
-        self.AddPage(win, 'List')
-
-        win = self.makeColorPanel(wxCYAN)
-        self.AddPage(win, "Cyan")
-
-##         win = self.makeColorPanel(wxWHITE)
-##         self.AddPage(win, "White")
-
-##         win = self.makeColorPanel(wxBLACK)
-##         self.AddPage(win, "Black")
-
-        win = self.makeColorPanel(wxNamedColour('MIDNIGHT BLUE'))
-        self.AddPage(win, "MIDNIGHT BLUE")
-
-        win = self.makeColorPanel(wxNamedColour('INDIAN RED'))
-        self.AddPage(win, "INDIAN RED")
+        # Now make a bunch of panels for the list book
+        first = True
+        imID = 0
+        for colour in colourList:
+            win = self.makeColorPanel(colour)
+            self.AddPage(win, colour, imageId=imID)
+            imID += 1
+            if imID == il.GetImageCount(): imID = 0
+            if first:
+                st = wxStaticText(win.win, -1,
+                          "You can put nearly any type of window here,\n"
+                          "and the list can be on any side of the Listbook",
+                          wxPoint(10, 10))
+                #st.SetForegroundColour(wxWHITE)
+                #st.SetBackgroundColour(wxBLUE)
+                first = False
+            
+                
 
         EVT_LISTBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged)
         EVT_LISTBOOK_PAGE_CHANGING(self, self.GetId(), self.OnPageChanging)
 
 
     def makeColorPanel(self, color):
-        p = wxPanel(self, -1)
+        p = wx.Panel(self, -1)
         win = ColorPanel.ColoredPanel(p, color)
         p.win = win
         def OnCPSize(evt, win=win):
             win.SetSize(evt.GetSize())
-        EVT_SIZE(p, OnCPSize)
+        p.Bind(wx.EVT_SIZE, OnCPSize)
         return p
 
 
@@ -109,8 +106,6 @@ def runTest(frame, nb, log):
 #----------------------------------------------------------------------------
 
 
-
-
 overview = """\
 <html><body>
 <h2>wxListbook</h2>
@@ -128,6 +123,3 @@ if __name__ == '__main__':
     run.main(['', os.path.basename(sys.argv[0])])
 
 
-
-
-