X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfef5d5165735ab6c9e1b0bd9c4ece1b6f848f26..d3a80c922c7f0932f0b3985846e58ef48e3a6da7:/wxPython/demo/wxNotebook.py

diff --git a/wxPython/demo/wxNotebook.py b/wxPython/demo/wxNotebook.py
index 745b40c13c..4af4007dcd 100644
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/wxNotebook.py
@@ -15,22 +15,24 @@ class TestNB(wxNotebook):
         wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
         self.log = log
 
-        win = ColorPanel.ColoredPanel(self, wxBLUE)
+
+        win = self.makeColorPanel(wxBLUE)
         self.AddPage(win, "Blue")
-        st = wxStaticText(win, -1,
+        st = wxStaticText(win.win, -1,
                           "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)
 
-        win = ColorPanel.ColoredPanel(self, wxRED)
+        win = self.makeColorPanel(wxRED)
         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)
@@ -39,26 +41,45 @@ class TestNB(wxNotebook):
         win = wxListCtrl.TestListCtrlPanel(self, log)
         self.AddPage(win, 'List')
 
-        win = ColorPanel.ColoredPanel(self, wxCYAN)
+        win = self.makeColorPanel(wxCYAN)
         self.AddPage(win, "Cyan")
 
-        win = ColorPanel.ColoredPanel(self, wxWHITE)
+        win = self.makeColorPanel(wxWHITE)
         self.AddPage(win, "White")
 
-        win = ColorPanel.ColoredPanel(self, wxBLACK)
+        win = self.makeColorPanel(wxBLACK)
         self.AddPage(win, "Black")
 
-        win = ColorPanel.ColoredPanel(self, wxNamedColour('MIDNIGHT BLUE'))
+        win = self.makeColorPanel(wxNamedColour('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)
+        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):
-        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()