mention ShouldInheritColours() change

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

index 4af4007dcd6cf8865316d82c4430f6e4ec7d0200..1f46c2c6e87fa352ff4a092a47e32b97fb6e6c9e 100644 (file)
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/wxNotebook.py
@@ -5,6 +5,7 @@ import ColorPanel
  import GridSimple
  import wxListCtrl
  import wxScrolledWindow
+import images
  
  import sys
  
@@ -12,10 +13,14 @@ import sys
  
  class TestNB(wxNotebook):
      def __init__(self, parent, id, log):
-        wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
+        wxNotebook.__init__(self, parent, id, style=
+                            #wxNB_TOP
+                            wxNB_BOTTOM
+                            #wxNB_LEFT
+                            #wxNB_RIGHT
+                            )
          self.log = log
  
-
          win = self.makeColorPanel(wxBLUE)
          self.AddPage(win, "Blue")
          st = wxStaticText(win.win, -1,
@@ -26,6 +31,16 @@ class TestNB(wxNotebook):
          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())
+        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")
  
@@ -44,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")
@@ -73,16 +88,17 @@ class TestNB(wxNotebook):
      def OnPageChanged(self, event):
          old = event.GetOldSelection()
          new = event.GetSelection()
-        self.log.write('OnPageChanged, old:%d, new:%d\n' % (old, new))
+        sel = self.GetSelection()
+        self.log.write('OnPageChanged,  old:%d, new:%d, sel:%d\n' % (old, new, sel))
          event.Skip()
  
      def OnPageChanging(self, event):
          old = event.GetOldSelection()
          new = event.GetSelection()
-        self.log.write('OnPageChanging, old:%d, new:%d\n' % (old, new))
+        sel = self.GetSelection()
+        self.log.write('OnPageChanging, old:%d, new:%d, sel:%d\n' % (old, new, sel))
          event.Skip()
  
-
  #----------------------------------------------------------------------------
  
  def runTest(frame, nb, log):
@@ -94,28 +110,27 @@ def runTest(frame, nb, log):
  
  
  
+overview = """\
+<html><body>
+<h2>wxNotebook</h2>
+<p>
+This class represents a notebook control, which manages multiple
+windows with associated tabs.
+<p>
+To use the class, create a wxNotebook object and call AddPage or
+InsertPage, passing a window to be used as the page. Do not explicitly
+delete the window for a page that is currently managed by wxNotebook.
  
+"""
  
  
  
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
  
  
  
  
-overview = """\
-This class represents a notebook control, which manages multiple windows with associated tabs.
-
-To use the class, create a wxNotebook object and call AddPage or InsertPage, passing a window to be used as the page. Do not explicitly delete the window for a page that is currently managed by wxNotebook.
-
-"""
-
-
-if __name__ == "__main__":
-    app = wxPySimpleApp()
-    frame = wxFrame(None, -1, "Test Notebook", size=(600, 400))
-    win = TestNB(frame, -1, sys.stdout)
-    frame.Show(true)
-    app.MainLoop()
-
-