compilation fixes for the compilers with old headers

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 076240ec1d87124e31c5f45e5ffa7ca688510934..edcd378ee6b207b807e38b97879b519024b7d2e5 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -22,16 +22,20 @@ import images
 
 
 _treeList = [
 
 
 _treeList = [

-    ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe',
+    ('New since last release', ['ContextHelp',
+                                'PyCrust',
+                                'PyCrustWithFilling',
+                                'VirtualListCtrl',
+                                'wxListCtrl',
+                                'TablePrint',

                                 ]),
 
                                 ]),
 

-    ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
-
-    ('Non-Managed Windows', ['wxGrid', 'wxSashWindow',
-                             'wxScrolledWindow', 'wxSplitterWindow',
-                             'wxStatusBar', 'wxNotebook',
-                             'wxHtmlWindow',
-                             'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),
+    ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
+                 'wxGrid', 'wxSashWindow',
+                 'wxScrolledWindow', 'wxSplitterWindow',
+                 'wxStatusBar', 'wxNotebook',
+                 'wxHtmlWindow',
+                 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),

 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                         'wxSingleChoiceDialog', 'wxTextEntryDialog',
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                         'wxSingleChoiceDialog', 'wxTextEntryDialog',


@@ -42,24 +46,26 @@ _treeList = [
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',

-                  'wxCalendarCtrl',
+                  'wxCalendarCtrl', 'wxToggleButton',

                   ]),
 
                   ]),
 

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

 
     ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
 
     ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',

-                        'wxDragImage', "wxProcess", "FancyText",
+                        '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', 'TablePrint',

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


@@ -77,7 +83,14 @@ class wxPythonDemo(wxFrame):
         self.cwd = os.getcwd()
         self.curOverview = ""
 
         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__':
         self.SetIcon(icon)
 
         if wxPlatform == '__WXMSW__':


@@ -102,8 +115,11 @@ 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
+        # Prevent TreeCtrl from displaying all items after destruction when true

         self.dying = false
 
         # Make a File menu
         self.dying = false
 
         # Make a File menu


@@ -166,7 +182,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


@@ -177,14 +193,17 @@ 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.ovr = wxHtmlWindow(panel, -1, size=(400, 400))

+            self.ovr.SetFonts("", "", [7, 8, 10, 12, 16, 22, 30])

             self.nb.AddPage(panel, "Overview")
 
             def OnOvrSize(evt, ovr=self.ovr):
                 ovr.SetSize(evt.GetSize())
 
             EVT_SIZE(panel, OnOvrSize)
             self.nb.AddPage(panel, "Overview")
 
             def OnOvrSize(evt, ovr=self.ovr):
                 ovr.SetSize(evt.GetSize())
 
             EVT_SIZE(panel, OnOvrSize)

+            EVT_ERASE_BACKGROUND(panel, EmptyHandler)
+

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


@@ -192,7 +211,6 @@ class wxPythonDemo(wxFrame):
         # Set up a TextCtrl on the Demo Code Notebook page
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         # Set up a TextCtrl on the Demo Code Notebook page
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)

-        self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))

         self.nb.AddPage(self.txt, "Demo Code")
 
 
         self.nb.AddPage(self.txt, "Demo Code")
 
 


@@ -460,7 +478,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