minor clean up

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 7a3f85431070a4f1d944a5ad8f7b3f88ffe6681d..bd8dea1fcef973a9c8dc96735cacf0b4748b0c64 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -22,8 +22,9 @@ import images
 
 
 _treeList = [
 
 
 _treeList = [

-    ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe',
-                                'ColourDB', 'wxToggleButton', 'OOR', 'wxWave',
+    ('New since last release', ['ContextHelp',
+                                'PyCrust',
+                                'VirtualListCtrl'

                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),


@@ -46,7 +47,7 @@ _treeList = [
                   'wxCalendarCtrl', 'wxToggleButton',
                   ]),
 
                   'wxCalendarCtrl', 'wxToggleButton',
                   ]),
 

-    ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]),
+    ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']),

 
     ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
 
     ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',


@@ -54,13 +55,15 @@ _treeList = [
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
                         'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
                         'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",

+                        'wxJoystick',

                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',

-                          'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
+                          'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',

                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',

-                          'PyShellWindow', 'ColourSelect', 'ImageBrowser',
+                          'ColourSelect', 'ImageBrowser',
+                          'infoframe', 'ColourDB', 'PyCrust',

                           ]),
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
                           ]),
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),


@@ -110,6 +113,9 @@ class wxPythonDemo(wxFrame):
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 
         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
 
         # Prevent TreeCtrl from displaying all items after destruction
         self.dying = false


@@ -174,7 +180,7 @@ class wxPythonDemo(wxFrame):
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook
         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
 
         # Set up a wxHtmlWindow on the Overview Notebook page
         # we put it in a panel first because there seems to be a


@@ -185,7 +191,7 @@ class wxPythonDemo(wxFrame):
             self.nb.AddPage(self.ovr, "Overview")
 
         else:  # hopefully I can remove this hacky code soon, see bug #216861
             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")
 
             self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
             self.nb.AddPage(panel, "Overview")
 


@@ -193,6 +199,8 @@ class wxPythonDemo(wxFrame):
                 ovr.SetSize(evt.GetSize())
 
             EVT_SIZE(panel, OnOvrSize)
                 ovr.SetSize(evt.GetSize())
 
             EVT_SIZE(panel, OnOvrSize)

+            EVT_ERASE_BACKGROUND(panel, EmptyHandler)
+

 
         self.SetOverview("Overview", overview)
 
 
         self.SetOverview("Overview", overview)
 


@@ -468,7 +476,7 @@ class MyApp(wxApp):
 
 def main():
     try:
 
 def main():
     try:

-        demoPath = os.path.split(__file__)[0]
+        demoPath = os.path.dirname(__file__)

         os.chdir(demoPath)
     except:
         pass
         os.chdir(demoPath)
     except:
         pass