Applied patch [ 565012 ] Add wxTextValidator to wxTextEntryDialog

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index e5b804fc3d9492607686ed1b6cc70e46ba308b68..82b0a9b9f5dcebbc0fd7d2eaa996e8f951a5502b 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -15,7 +15,7 @@ import sys, os, time, string
 from   wxPython.wx import *
 from   wxPython.html import wxHtmlWindow
 
-from wxPython.stc import *
+##from wxPython.stc import *
 
 import images
 
@@ -30,6 +30,7 @@ _treeList = [
         'wxFileHistory',
         'wxGenericDirCtrl',
         'wxImageFromStream',
+        'wxArtProvider',
         ]),
 
     # managed windows == things with a caption you can close
@@ -65,7 +66,6 @@ _treeList = [
 
     # core controls
     ('Core Windows/Controls', [
-        'VirtualListCtrl',
         'wxButton',
         'wxCheckBox',
         'wxCheckListBox',
@@ -76,6 +76,7 @@ _treeList = [
         'wxGrid',
         'wxListBox',
         'wxListCtrl',
+        'wxListCtrl_virtual',
         'wxNotebook',
         'wxPopupWindow',
         'wxRadioBox',
@@ -154,6 +155,7 @@ _treeList = [
         'wxImage',
         'wxImageFromStream',
         'wxMask',
+        'wxArtProvider',
         ]),
 
     # Other stuff
@@ -450,15 +452,15 @@ class wxPythonDemo(wxFrame):
                     self.SetOverview(itemText + " Overview", module.overview)
                 finally:
                     wxEndBusyCursor()
+                self.tree.Refresh()
 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();
-                wxYield()
+                wxSafeYield()
 
                 self.window = module.runTest(self, self.nb, self) ###
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')
-                    #wxYield()  TODO: Is this still needed?
                     self.nb.SetSelection(2)
                     self.nb.Refresh()  # without this wxMac has troubles showing the just added page
 
@@ -600,7 +602,8 @@ class MySplashScreen(wxSplashScreen):
         bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap()
         wxSplashScreen.__init__(self, bmp,
                                 wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
-                                4000, None, -1)
+                                4000, None, -1,
+                                style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP)
         EVT_CLOSE(self, self.OnClose)
 
     def OnClose(self, evt):