X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49875c533ba56fd78c26fc9862ec3e84c66dfb74..2da6105611475cb08135997c587df72be67840bd:/wxPython/demo/Main.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index d1745623fb..db8bd91947 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,61 +11,98 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
-import sys, os
+import sys, os, time, string
from wxPython.wx import *
-from wxPython.lib.splashscreen import SplashScreen
from wxPython.html import wxHtmlWindow
+import images
+
#---------------------------------------------------------------------------
_treeList = [
- ('New since last release', ['ColourSelect', 'ImageBrowser',
+ ('New since last release', ['wxGenericDirCtrl',
]),
- ('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',
+ 'wxPopupWindow',
+ 'wxDynamicSashWindow',
+ ]),
('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
'wxSingleChoiceDialog', 'wxTextEntryDialog',
'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
- 'wxMessageDialog', 'wxProgressDialog']),
+ 'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog',
+ ]),
('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',
+ 'wxCalendarCtrl', 'wxToggleButton',
+ 'wxEditableListBox', 'wxLEDNumberCtrl',
]),
- ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]),
+ ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']),
- ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
+ ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop',
+ 'FontEnumerator',
'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
'PythonEvents', 'Threads',
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
- 'wxDragImage', "wxProcess", "FancyText",
+ 'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
+ 'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
+ 'ContextHelp', 'SplitTree',
]),
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
- 'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
+ 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
'FileBrowseButton', 'GenericButtons', 'wxEditor',
- 'PyShellWindow', 'ColourSelect', 'ImageBrowser',
+ 'ColourSelect', 'ImageBrowser',
+ 'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+ 'TablePrint',
+ 'wxRightTextCtrl',
]),
- ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
+ ('Cool Contribs', ['pyTree', 'hangman',
+ #'SlashDot',
+ 'XMLtreeview'
+ ]),
]
#---------------------------------------------------------------------------
+class MyLog(wxPyLog):
+ def __init__(self, textCtrl, logTime=0):
+ wxPyLog.__init__(self)
+ self.tc = textCtrl
+ self.logTime = logTime
+
+ def DoLogString(self, message, timeStamp):
+ if self.logTime:
+ message = time.strftime("%X", time.localtime(timeStamp)) + \
+ ": " + message
+ 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):
def __init__(self, parent, id, title):
@@ -75,10 +112,17 @@ class wxPythonDemo(wxFrame):
self.cwd = os.getcwd()
self.curOverview = ""
- if wxPlatform == '__WXMSW__':
- icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
- self.SetIcon(icon)
+ 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__':
# setup a taskbar icon, and catch some events from it
self.tbicon = wxTaskBarIcon()
self.tbicon.SetIcon(icon, "wxPython Demo")
@@ -100,8 +144,11 @@ class wxPythonDemo(wxFrame):
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
@@ -164,7 +211,7 @@ class wxPythonDemo(wxFrame):
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
@@ -175,7 +222,7 @@ class wxPythonDemo(wxFrame):
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")
@@ -183,6 +230,8 @@ class wxPythonDemo(wxFrame):
ovr.SetSize(evt.GetSize())
EVT_SIZE(panel, OnOvrSize)
+ EVT_ERASE_BACKGROUND(panel, EmptyHandler)
+
self.SetOverview("Overview", overview)
@@ -190,7 +239,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)
- self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))
self.nb.AddPage(self.txt, "Demo Code")
@@ -198,7 +246,8 @@ class wxPythonDemo(wxFrame):
self.log = wxTextCtrl(splitter2, -1,
style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
# Set the wxWindows log target to be this textctrl
- wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+ #wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+ wxLog_SetActiveTarget(MyLog(self.log))
@@ -331,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)
@@ -421,44 +469,53 @@ 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
+
#---------------------------------------------------------------------------
def main():
try:
- demoPath = os.path.split(__file__)[0]
+ demoPath = os.path.dirname(__file__)
os.chdir(demoPath)
except:
pass