don't add wxVSCROLL if only wxHSCROLL is explicitly specified (and vice versa), only...

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

diff --git a/wxPython/demo/Notebook.py b/wxPython/demo/Notebook.py
index 9637ba95fae62dc07ce9a01370d0c0de60e4f757..f25f06d74f935d28d4f81847dfc1ff309b46a8b6 100644 (file)
--- a/wxPython/demo/Notebook.py
+++ b/wxPython/demo/Notebook.py
@@ -14,10 +14,12 @@ import  images
 class TestNB(wx.Notebook):
     def __init__(self, parent, id, log):
         wx.Notebook.__init__(self, parent, id, size=(21,21), style=
 class TestNB(wx.Notebook):
     def __init__(self, parent, id, log):
         wx.Notebook.__init__(self, parent, id, size=(21,21), style=

-                             #wx.NB_TOP # | wx.NB_MULTILINE
-                             #wx.NB_BOTTOM
-                             #wx.NB_LEFT
-                             #wx.NB_RIGHT
+                             wx.BK_DEFAULT
+                             #wx.BK_TOP 
+                             #wx.BK_BOTTOM
+                             #wx.BK_LEFT
+                             #wx.BK_RIGHT
+                             # | wx.NB_MULTILINE

                              )
         self.log = log
 
                              )
         self.log = log
 


@@ -60,17 +62,11 @@ class TestNB(wx.Notebook):
         win = self.makeColorPanel(wx.CYAN)
         self.AddPage(win, "Cyan")
 
         win = self.makeColorPanel(wx.CYAN)
         self.AddPage(win, "Cyan")
 

-#         win = self.makeColorPanel(wxWHITE)
-#         self.AddPage(win, "White")
+        win = self.makeColorPanel(wx.NamedColour('Midnight Blue'))
+        self.AddPage(win, "Midnight Blue")

 
 

-#         win = self.makeColorPanel(wxBLACK)
-#         self.AddPage(win, "Black")
-
-        win = self.makeColorPanel(wx.NamedColour('MIDNIGHT BLUE'))
-        self.AddPage(win, "MIDNIGHT BLUE")
-
-        win = self.makeColorPanel(wx.NamedColour('INDIAN RED'))
-        self.AddPage(win, "INDIAN RED")
+        win = self.makeColorPanel(wx.NamedColour('Indian Red'))
+        self.AddPage(win, "Indian Red")

 
         self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
         self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnPageChanging)
 
         self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
         self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnPageChanging)


@@ -80,13 +76,13 @@ class TestNB(wx.Notebook):
         p = wx.Panel(self, -1)
         win = ColorPanel.ColoredPanel(p, color)
         p.win = win
         p = wx.Panel(self, -1)
         win = ColorPanel.ColoredPanel(p, color)
         p.win = win

-

         def OnCPSize(evt, win=win):
         def OnCPSize(evt, win=win):

+            win.SetPosition((0,0))

             win.SetSize(evt.GetSize())
             win.SetSize(evt.GetSize())

-

         p.Bind(wx.EVT_SIZE, OnCPSize)
         return p
 
         p.Bind(wx.EVT_SIZE, OnCPSize)
         return p
 

+

     def OnPageChanged(self, event):
         old = event.GetOldSelection()
         new = event.GetSelection()
     def OnPageChanged(self, event):
         old = event.GetOldSelection()
         new = event.GetSelection()