X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a64d5510ceb4e3fee71e8e4f1b2ee362e720894..75d9e502238df95fa53c0030b1fac0d4f43e4025:/wxPython/demo/FlatNotebook.py

diff --git a/wxPython/demo/FlatNotebook.py b/wxPython/demo/FlatNotebook.py
index c0fbfe5414..0de95de359 100644
--- a/wxPython/demo/FlatNotebook.py
+++ b/wxPython/demo/FlatNotebook.py
@@ -58,6 +58,8 @@ MENU_DISABLE_TAB = wx.NewId()
 MENU_ENABLE_DRAG_N_DROP = wx.NewId()
 MENU_DCLICK_CLOSES_TAB = wx.NewId()
 MENU_USE_VC8_STYLE = wx.NewId()
+MENU_USE_FF2_STYLE = wx.NewId()
+MENU_HIDE_ON_SINGLE_TAB = wx.NewId()
 
 MENU_SET_ACTIVE_TEXT_COLOR = wx.NewId()
 MENU_DRAW_TAB_X = wx.NewId()
@@ -178,6 +180,10 @@ class FlatNotebookDemo(wx.Frame):
         self.Bind(wx.EVT_MENU, self.OnFancyStyle, item)
         styleMenu.AppendItem(item)
 
+        item = wx.MenuItem(styleMenu, MENU_USE_FF2_STYLE, "Use Firefox 2 Style", "Use Firefox 2 Style", wx.ITEM_RADIO)
+        self.Bind(wx.EVT_MENU, self.OnFF2Style, item)
+        styleMenu.AppendItem(item)
+        
         self._visualMenu.AppendMenu(wx.ID_ANY, "Tabs Style", styleMenu)
 
         item = wx.MenuItem(self._visualMenu, MENU_SELECT_GRADIENT_COLOR_FROM, "Select fancy tab style 'from' color",
@@ -197,6 +203,11 @@ class FlatNotebookDemo(wx.Frame):
         self.Bind(wx.EVT_MENU_RANGE, self.OnSelectColor, id=MENU_SELECT_GRADIENT_COLOR_FROM,
                   id2=MENU_SELECT_GRADIENT_COLOR_BORDER)        
 
+        item = wx.MenuItem(self._editMenu, MENU_HIDE_ON_SINGLE_TAB, "Hide Page Container when only one Tab",
+                           "Hide Page Container when only one Tab", wx.ITEM_CHECK)
+        self.Bind(wx.EVT_MENU, self.OnStyle, item)
+        self._editMenu.AppendItem(item)
+
         item = wx.MenuItem(self._editMenu, MENU_HIDE_NAV_BUTTONS, "Hide Navigation Buttons",
                            "Hide Navigation Buttons", wx.ITEM_CHECK)
         self._editMenu.AppendItem(item)
@@ -374,6 +385,15 @@ class FlatNotebookDemo(wx.Frame):
             
             self.book.SetWindowStyleFlag(style)
 
+        elif eventid == MENU_HIDE_ON_SINGLE_TAB:
+            if event.IsChecked():
+                # Hide the navigation buttons
+                style |= fnb.FNB_HIDE_ON_SINGLE_TAB
+            else:
+                style &= ~(fnb.FNB_HIDE_ON_SINGLE_TAB)
+
+            self.book.SetWindowStyleFlag(style)
+
         elif eventid == MENU_HIDE_X:
             if event.IsChecked():
                 # Hide the X button
@@ -428,12 +448,25 @@ class FlatNotebookDemo(wx.Frame):
         self._bShowImages = event.IsChecked()
 
 
+    def OnFF2Style(self, event):
+
+        style = self.book.GetWindowStyleFlag()
+
+        # remove old tabs style
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
+        style &= mirror
+
+        style |= fnb.FNB_FF2
+
+        self.book.SetWindowStyleFlag(style)
+
+
     def OnVC71Style(self, event):
 
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         style |= fnb.FNB_VC71
@@ -446,7 +479,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         # set new style
@@ -460,7 +493,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         self.book.SetWindowStyleFlag(style)
@@ -471,7 +504,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         style |= fnb.FNB_FANCY_TABS