Replaced "-erase" calls with "-$(RM)" calls

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index afd2b131c9cb5c287f53b9dbd84b13c0111be456..4ee72f29a1b556dce10b09d921a860e16cf071db 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -22,19 +22,7 @@ import images
 
 
 _treeList = [
 
 
 _treeList = [

-    ('New since last release', ['ContextHelp',
-                                'PyCrust',
-                                'PyCrustWithFilling',
-                                'VirtualListCtrl',
-                                'wxListCtrl',
-                                'TablePrint',
-                                'OOR',
-                                'wxFindReplaceDialog',
-                                'DrawXXXList',
-                                'ErrorDialogs',
-                                'wxRightTextCtrl',
-                                'URLDragAndDrop',
-                                ##'wxPopupWindow',
+    ('New since last release', ['wxGenericDirCtrl',

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


@@ -43,7 +31,8 @@ _treeList = [
                  'wxStatusBar', 'wxNotebook',
                  'wxHtmlWindow',
                  'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',
                  'wxStatusBar', 'wxNotebook',
                  'wxHtmlWindow',
                  'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',

-                 ##'wxPopupWindow',
+                 'wxPopupWindow',
+                 'wxDynamicSashWindow',

                  ]),
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                  ]),
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',


@@ -53,10 +42,12 @@ _treeList = [
                         ]),
 
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
                         ]),
 
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',

-                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
+                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
+                  'wxTextCtrl',

                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
                   'wxCalendarCtrl', 'wxToggleButton',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
                   'wxCalendarCtrl', 'wxToggleButton',

+                  'wxEditableListBox', 'wxLEDNumberCtrl',

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


@@ -68,7 +59,8 @@ _treeList = [
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
                         'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
                         'PythonEvents', 'Threads',
                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
                         'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",

-                        'wxJoystick', 'DrawXXXList', 'ErrorDialogs',
+                        'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
+                        'ContextHelp', 'SplitTree',

                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
                         ]),
 
     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',


@@ -76,11 +68,15 @@ _treeList = [
                           'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
                           'ColourSelect', 'ImageBrowser',
                           'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
                           'ColourSelect', 'ImageBrowser',

-                          'infoframe', 'ColourDB', 'PyCrust', 'TablePrint',
+                          'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+                          'TablePrint',

                           'wxRightTextCtrl',
                           ]),
 
                           'wxRightTextCtrl',
                           ]),
 

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

 
     ]
 
 
     ]
 


@@ -468,24 +464,19 @@ class wxPythonDemo(wxFrame):
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 

-class MyApp(wxApp):
-    def OnInit(self):
-        wxInitAllImageHandlers()
+class MySplashScreen(wxSplashScreen):
+    def __init__(self):
+        bmp = wxImage('bitmaps/splash.gif').ConvertToBitmap()
+        wxSplashScreen.__init__(self, bmp,
+                                wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+                                4000, None, -1)
+        EVT_CLOSE(self, self.OnClose)

 
 

-        self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
-                              duration=4000, callback=self.AfterSplash)
-        self.splash.Show(true)
-        wxYield()
-        return true
-
-
-    def AfterSplash(self):
-        self.splash.Close(true)
+    def OnClose(self, evt):

         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)

-        self.SetTopWindow(frame)

         self.ShowTip(frame)
         self.ShowTip(frame)

-
+        evt.Skip()

 
     def ShowTip(self, frame):
         try:
 
     def ShowTip(self, frame):
         try:


@@ -493,7 +484,6 @@ class MyApp(wxApp):
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)

-        #print showTip, index

         if showTip:
             tp = wxCreateFileTipProvider("data/tips.txt", index)
             showTip = wxShowTip(frame, tp)
         if showTip:
             tp = wxCreateFileTipProvider("data/tips.txt", index)
             showTip = wxShowTip(frame, tp)


@@ -501,6 +491,21 @@ class MyApp(wxApp):
             open("data/showTips", "w").write(str( (showTip, index) ))
 
 
             open("data/showTips", "w").write(str( (showTip, index) ))
 
 

+
+class MyApp(wxApp):
+    def OnInit(self):
+        """
+        Create and show the splash screen.  It will then create and show
+        the main frame when it is time to do so.
+        """
+        wxInitAllImageHandlers()
+        splash = MySplashScreen()
+        splash.Show()
+        wxYield()
+        return true
+
+
+

 #---------------------------------------------------------------------------
 
 def main():
 #---------------------------------------------------------------------------
 
 def main():