X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ace611be19b19219865cae0d513e08e488dd63..2dace059ee7aefeea0f2b843f1808b117f112795:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 8f8297e773..6f1c2b2787 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -22,8 +22,7 @@ import images
 
 
 _treeList = [
-    ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe',
-                                'ColourDB',
+    ('New since last release', ['wxTextCtrl', 'XML_Resource'
                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
@@ -43,7 +42,7 @@ _treeList = [
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
-                  'wxCalendarCtrl',
+                  'wxCalendarCtrl', 'wxToggleButton',
                   ]),
 
     ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]),
@@ -53,7 +52,8 @@ _treeList = [
                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
-                        'wxDragImage', "wxProcess", "FancyText",
+                        'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
+                        'wxJoystick',
                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
@@ -61,6 +61,7 @@ _treeList = [
                           'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
                           'PyShellWindow', 'ColourSelect', 'ImageBrowser',
+                          'infoframe', 'ColourDB',
                           ]),
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
@@ -78,7 +79,14 @@ class wxPythonDemo(wxFrame):
         self.cwd = os.getcwd()
         self.curOverview = ""
 
-        icon = wxIconFromXPMData(images.getMondrianData())
+        if 1:
+            icon = wxIconFromXPMData(images.getMondrianData())
+        else:
+            # another way to do it
+            bmp = images.getMondrianBitmap()
+            icon = wxEmptyIcon()
+            icon.CopyFromBitmap(bmp)
+
         self.SetIcon(icon)
 
         if wxPlatform == '__WXMSW__':
@@ -103,6 +111,9 @@ class wxPythonDemo(wxFrame):
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 
+        def EmptyHandler(evt): pass
+        EVT_ERASE_BACKGROUND(splitter, EmptyHandler)
+        EVT_ERASE_BACKGROUND(splitter2, EmptyHandler)
 
         # Prevent TreeCtrl from displaying all items after destruction
         self.dying = false
@@ -167,7 +178,7 @@ class wxPythonDemo(wxFrame):
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook
-        self.nb = wxNotebook(splitter2, -1)
+        self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN)
 
         # Set up a wxHtmlWindow on the Overview Notebook page
         # we put it in a panel first because there seems to be a
@@ -178,7 +189,7 @@ class wxPythonDemo(wxFrame):
             self.nb.AddPage(self.ovr, "Overview")
 
         else:  # hopefully I can remove this hacky code soon, see bug #216861
-            panel = wxPanel(self.nb, -1)
+            panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
             self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
             self.nb.AddPage(panel, "Overview")
 
@@ -186,6 +197,8 @@ class wxPythonDemo(wxFrame):
                 ovr.SetSize(evt.GetSize())
 
             EVT_SIZE(panel, OnOvrSize)
+            EVT_ERASE_BACKGROUND(panel, EmptyHandler)
+
 
         self.SetOverview("Overview", overview)
 
@@ -461,7 +474,7 @@ class MyApp(wxApp):
 
 def main():
     try:
-        demoPath = os.path.split(__file__)[0]
+        demoPath = os.path.dirname(__file__)
         os.chdir(demoPath)
     except:
         pass