X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4309b812efa07373abe6b8b6bba29e2fe2e4c49f..d1fe917ba097fd8039a4340d1d82115f72cbbd91:/wxPython/demo/Main.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index a6f8cdae42..db8bd91947 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,9 +11,8 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
-import sys, os, time
+import sys, os, time, string
from wxPython.wx import *
-from wxPython.lib.splashscreen import SplashScreen
from wxPython.html import wxHtmlWindow
import images
@@ -22,25 +21,7 @@ import images
_treeList = [
- ('New since last release', ['ContextHelp',
- 'PyCrust',
- 'PyCrustWithFilling',
- 'VirtualListCtrl',
- 'wxListCtrl',
- 'TablePrint',
- 'OOR',
- 'wxFindReplaceDialog',
- 'DrawXXXList',
- 'ErrorDialogs',
- 'wxRightTextCtrl',
- 'URLDragAndDrop',
- 'wxMimeTypesManager',
- 'wxPopupWindow',
- 'wxDynamicSashWindow',
- 'wxEditableListBox',
- 'SplitTree',
- 'wxLEDNumberCtrl',
- 'wxEditor',
+ ('New since last release', ['wxGenericDirCtrl',
]),
('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
@@ -60,7 +41,8 @@ _treeList = [
]),
('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',
@@ -77,7 +59,7 @@ _treeList = [
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
- 'SplitTree',
+ 'ContextHelp', 'SplitTree',
]),
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
@@ -85,7 +67,8 @@ _treeList = [
'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
'FileBrowseButton', 'GenericButtons', 'wxEditor',
'ColourSelect', 'ImageBrowser',
- 'infoframe', 'ColourDB', 'PyCrust', 'TablePrint',
+ 'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+ 'TablePrint',
'wxRightTextCtrl',
]),
@@ -111,6 +94,13 @@ class MyLog(wxPyLog):
self.tc.AppendText(message + '\n')
+#---------------------------------------------------------------------------
+
+def opj(path):
+ """Convert paths to the platform-specific separator"""
+ return apply(os.path.join, tuple(string.split(path, '/')))
+
+
#---------------------------------------------------------------------------
class wxPythonDemo(wxFrame):
@@ -390,7 +380,6 @@ class wxPythonDemo(wxFrame):
lead = text[:6]
if lead != '' and lead != '':
text = string.join(string.split(text, '\n'), '
')
- #text = '' + text + '
'
self.ovr.SetPage(text)
self.nb.SetPageText(0, name)
@@ -480,37 +469,46 @@ class wxPythonDemo(wxFrame):
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
-class MyApp(wxApp):
- def OnInit(self):
- wxInitAllImageHandlers()
-
- self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
- duration=4000, callback=self.AfterSplash)
- self.splash.Show(true)
- wxYield()
- return true
-
+class MySplashScreen(wxSplashScreen):
+ def __init__(self):
+ bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap()
+ wxSplashScreen.__init__(self, bmp,
+ wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+ 4000, None, -1)
+ EVT_CLOSE(self, self.OnClose)
- def AfterSplash(self):
- self.splash.Close(true)
+ def OnClose(self, evt):
frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
frame.Show(true)
- self.SetTopWindow(frame)
self.ShowTip(frame)
-
+ evt.Skip()
def ShowTip(self, frame):
try:
- showTipText = open("data/showTips").read()
+ showTipText = open(opj("data/showTips")).read()
showTip, index = eval(showTipText)
except IOError:
showTip, index = (1, 0)
- #print showTip, index
if showTip:
- tp = wxCreateFileTipProvider("data/tips.txt", index)
+ tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)
showTip = wxShowTip(frame, tp)
index = tp.GetCurrentTip()
- open("data/showTips", "w").write(str( (showTip, index) ))
+ open(opj("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
+
#---------------------------------------------------------------------------