Put a panel under the colored windows so wxGTK's notebook doesn't

munge the bg color

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/wxNotebook.py b/wxPython/demo/wxNotebook.py
index df761009353be026e9ae258db4fb37c7f0c6ba37..4af4007dcd6cf8865316d82c4430f6e4ec7d0200 100644 (file)
--- a/wxPython/demo/wxNotebook.py
+++ b/wxPython/demo/wxNotebook.py
@@ -15,9 +15,10 @@ class TestNB(wxNotebook):
         wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
         self.log = log
 
         wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
         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"
                           "and if the platform supports it then the\n"
                           "tabs can be on any side of the notebook.",
                           "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.",


@@ -25,13 +26,13 @@ class TestNB(wxNotebook):
         st.SetForegroundColour(wxWHITE)
         st.SetBackgroundColour(wxBLUE)
 
         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')
 
         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)


@@ -40,25 +41,35 @@ 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)
         EVT_NOTEBOOK_PAGE_CHANGING(self, self.GetId(), self.OnPageChanging)
 
 
         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):
         old = event.GetOldSelection()
         new = event.GetSelection()
     def OnPageChanged(self, event):
         old = event.GetOldSelection()
         new = event.GetSelection()