Removed deprecation warnings in OGL and Gizmos

[wxWidgets.git] / wxPython / demo / wxNotebook.py

diff --git a/wxPython/demo/wxNotebook.py b/wxPython/demo/wxNotebook.py
index 00d2f5b9d007b51fe83cf0142f2dd6af9b53a7f1..ced491b69d4cc7cad27032bc7355ce4b342693d1 100644 (file)
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/wxNotebook.py
@@ -5,30 +5,49 @@ import ColorPanel
 import GridSimple
 import wxListCtrl
 import wxScrolledWindow
 import GridSimple
 import wxListCtrl
 import wxScrolledWindow

+import images
+
+import sys

 
 #----------------------------------------------------------------------------
 
 class TestNB(wxNotebook):
     def __init__(self, parent, id, log):
 
 #----------------------------------------------------------------------------
 
 class TestNB(wxNotebook):
     def __init__(self, parent, id, log):

-        wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
+        wxNotebook.__init__(self, parent, id, style=
+                            #0
+                            wxNB_BOTTOM
+                            #wxNB_LEFT
+                            #wxNB_RIGHT
+                            )

         self.log = log
 
         self.log = log
 

-        win = ColorPanel.ColoredPanel(self, wxBLUE)
+        win = self.makeColorPanel(wxBLUE)

         self.AddPage(win, "Blue")
         self.AddPage(win, "Blue")

-        st = wxStaticText(win, -1,
+        st = wxStaticText(win.win, -1,

                           "You can put nearly any type of window here,\n"
                           "You can put nearly any type of window here,\n"

-                          "and the tabs can be on any side... (look below.)",
+                          "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)
 
                           wxPoint(10, 10))
         st.SetForegroundColour(wxWHITE)
         st.SetBackgroundColour(wxBLUE)
 

-        win = ColorPanel.ColoredPanel(self, wxRED)
+        # 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")
 
         win = wxScrolledWindow.MyCanvas(self)
         self.AddPage(win, 'ScrolledWindow')
 
         self.AddPage(win, "Red")
 
         win = wxScrolledWindow.MyCanvas(self)
         self.AddPage(win, 'ScrolledWindow')
 

-        win = ColorPanel.ColoredPanel(self, wxGREEN)
+        win = self.makeColorPanel(wxGREEN)

         self.AddPage(win, "Green")
 
         win = GridSimple.SimpleGrid(self, log)
         self.AddPage(win, "Green")
 
         win = GridSimple.SimpleGrid(self, log)


@@ -37,26 +56,45 @@ class TestNB(wxNotebook):
         win = wxListCtrl.TestListCtrlPanel(self, log)
         self.AddPage(win, 'List')
 
         win = wxListCtrl.TestListCtrlPanel(self, log)
         self.AddPage(win, 'List')
 

-        win = ColorPanel.ColoredPanel(self, wxCYAN)
+        win = self.makeColorPanel(wxCYAN)

         self.AddPage(win, "Cyan")
 
         self.AddPage(win, "Cyan")
 

-        win = ColorPanel.ColoredPanel(self, wxWHITE)
+        win = self.makeColorPanel(wxWHITE)

         self.AddPage(win, "White")
 
         self.AddPage(win, "White")
 

-        win = ColorPanel.ColoredPanel(self, wxBLACK)
+        win = self.makeColorPanel(wxBLACK)

         self.AddPage(win, "Black")
 
         self.AddPage(win, "Black")
 

-        win = ColorPanel.ColoredPanel(self, wxNamedColour('MIDNIGHT BLUE'))
+        win = self.makeColorPanel(wxNamedColour('MIDNIGHT BLUE'))

         self.AddPage(win, "MIDNIGHT BLUE")
 
         self.AddPage(win, "MIDNIGHT BLUE")
 

-        win = ColorPanel.ColoredPanel(self, wxNamedColour('INDIAN RED'))
+        win = self.makeColorPanel(wxNamedColour('INDIAN RED'))

         self.AddPage(win, "INDIAN RED")
 
         EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged)
         self.AddPage(win, "INDIAN RED")
 
         EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged)

+        EVT_NOTEBOOK_PAGE_CHANGING(self, self.GetId(), self.OnPageChanging)
+
+
+    def makeColorPanel(self, color):
+        p = wxPanel(self, -1)
+        win = ColorPanel.ColoredPanel(p, color)
+        p.win = win
+        def OnCPSize(evt, win=win):
+            win.SetSize(evt.GetSize())
+        EVT_SIZE(p, OnCPSize)
+        return p

 
 
     def OnPageChanged(self, event):
 
 
     def OnPageChanged(self, event):

-        self.log.write('OnPageChanged\n')
+        old = event.GetOldSelection()
+        new = event.GetSelection()
+        self.log.write('OnPageChanged, old:%d, new:%d\n' % (old, new))
+        event.Skip()
+
+    def OnPageChanging(self, event):
+        old = event.GetOldSelection()
+        new = event.GetSelection()
+        self.log.write('OnPageChanging, old:%d, new:%d\n' % (old, new))

         event.Skip()
 
 
         event.Skip()
 
 


@@ -71,17 +109,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.

 
 

-"""