X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/330af869400a9084ac801a545577b572fbd73365..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/demo/Main.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 14abd512b7..7dfe9cb2f7 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,8 +20,9 @@ import images
# For debugging
##wx.Trap();
+##print "wx.VERSION_STRING = ", wx.VERSION_STRING
##print os.getpid();
-##raw_input("Press a key...")
+##raw_input("Press Enter...")
#---------------------------------------------------------------------------
@@ -29,16 +30,9 @@ import images
_treeList = [
# new stuff
- ('Recent Additions', [
- 'VListBox',
- 'Listbook',
- 'MaskedNumCtrl',
+ ('Recent Additions/Updates', [
+ 'OGL',
'FloatCanvas',
- 'XmlResourceSubclass',
- 'GridBagSizer',
- 'Cursor',
- 'PyPlot',
- 'ImageAlpha',
]),
# managed windows == things with a (optional) caption you can close
@@ -68,7 +62,6 @@ _treeList = [
# dialogs from libraries
('More Dialogs', [
- 'ErrorDialogs',
'ImageBrowser',
'MultipleChoiceDialog',
'ScrolledMessageDialog',
@@ -76,6 +69,7 @@ _treeList = [
# core controls
('Core Windows/Controls', [
+ 'BitmapButton',
'Button',
'CheckBox',
'CheckListBox',
@@ -125,6 +119,9 @@ _treeList = [
# controls coming from other libraries
('More Windows/Controls', [
+ 'ActiveX_FlashWindow',
+ 'ActiveX_IEHtmlWindow',
+ 'ActiveX_PDFWindow',
#'RightTextCtrl', deprecated as we have wxTE_RIGHT now.
'Calendar',
'CalendarCtrl',
@@ -136,7 +133,6 @@ _treeList = [
'FloatBar',
'FloatCanvas',
'HtmlWindow',
- 'IEHtmlWin',
'IntCtrl',
'MVCTree',
'MaskedEditControls',
@@ -173,7 +169,6 @@ _treeList = [
('Process and Events', [
'EventManager',
'KeyEvents',
- 'OOR',
'Process',
'PythonEvents',
'Threads',
@@ -208,7 +203,6 @@ _treeList = [
'FileHistory',
'FontEnumerator',
'Joystick',
- 'NewNamespace',
'OGL',
'PrintFramework',
'ShapedWindow',
@@ -217,11 +211,8 @@ _treeList = [
]),
# need libs not coming with the demo
- ('Objects using an external library', [
- 'ActiveXWrapper_Acrobat',
- 'ActiveXWrapper_IE',
+ ('Samples using an external library', [
'GLCanvas',
- #'PlotCanvas', # deprecated, use PyPlot
]),
@@ -260,7 +251,7 @@ class MyTP(wx.PyTipProvider):
#
try:
- ##raise ImportError
+ ##raise ImportError # for testing the alternate implementation
from wx import stc
from StyledTextCtrl_2 import PythonSTC
class DemoCodeViewer(PythonSTC):
@@ -270,6 +261,8 @@ try:
# Some methods to make it compatible with how the wxTextCtrl is used
def SetValue(self, value):
+ if wx.USE_UNICODE:
+ value = value.decode('iso8859_1')
self.SetReadOnly(False)
self.SetText(value)
self.SetReadOnly(True)
@@ -444,8 +437,11 @@ class wxPythonDemo(wx.Frame):
if wx.Platform != '__WXMAC__':
# setup a taskbar icon, and catch some events from it
+ dim = 16 # (may want to use 22 on wxGTK...)
icon = wx.IconFromBitmap(
- images.getMondrianImage().Scale(16,16).ConvertToBitmap() )
+ images.getMondrianImage().Scale(dim,dim).ConvertToBitmap() )
+ #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
+ #icon = images.getMondrianIcon()
self.tbicon = wx.TaskBarIcon()
self.tbicon.SetIcon(icon, "wxPython Demo")
self.tbicon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
@@ -464,13 +460,13 @@ class wxPythonDemo(wx.Frame):
self.Centre(wx.BOTH)
self.CreateStatusBar(1, wx.ST_SIZEGRIP)
- splitter = wx.SplitterWindow(self, -1)
- splitter2 = wx.SplitterWindow(splitter, -1) ##, size=(20,20))
+ splitter = wx.SplitterWindow(self, -1, style=wx.CLIP_CHILDREN | wx.SP_LIVE_UPDATE | wx.SP_3D)
+ splitter2 = wx.SplitterWindow(splitter, -1, style=wx.CLIP_CHILDREN | wx.SP_LIVE_UPDATE | wx.SP_3D)
# Set up a log on the View Log Notebook page
self.log = wx.TextCtrl(splitter2, -1,
style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
-
+
# Set the wxWindows log target to be this textctrl
#wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log))
@@ -634,7 +630,7 @@ class wxPythonDemo(wx.Frame):
self.tree.EnsureVisible(selectedDemo)
- wx.LogMessage('window handle: %s' % self.GetHandle())
+## wx.LogMessage('window handle: %s' % self.GetHandle())
#---------------------------------------------
@@ -721,6 +717,7 @@ class wxPythonDemo(wx.Frame):
self.txt.Clear()
self.window = None
+ self.tree.SetFocus()
#---------------------------------------------
@@ -741,6 +738,8 @@ class wxPythonDemo(wx.Frame):
lead = text[:6]
if lead != '' and lead != '':
text = '
'.join(text.split('\n'))
+ if wx.USE_UNICODE:
+ text = text.decode('iso8859_1')
self.ovr.SetPage(text)
self.nb.SetPageText(0, name)
@@ -815,8 +814,6 @@ class wxPythonDemo(wx.Frame):
self.dying = True
self.window = None
self.mainmenu = None
- if hasattr(self, "tbicon"):
- del self.tbicon
self.Destroy()
@@ -921,14 +918,12 @@ class MyApp(wx.App):
the main frame when it is time to do so.
"""
- wx.InitAllImageHandlers()
-
# Normally when using a SplashScreen you would create it, show
# it and then continue on with the applicaiton's
# initialization, finally creating and showing the main
# application window(s). In this case we have nothing else to
# do so we'll delay showing the main frame until later (see
- # OnClose above) so the users can see the SplashScrren effect.
+ # OnClose above) so the users can see the SplashScreen effect.
splash = MySplashScreen()
splash.Show()
@@ -955,13 +950,12 @@ def main():
overview = """
wxPython
- wxPython is a GUI toolkit for the Python programming language. It
-allows Python programmers to create programs with a robust, highly
-functional graphical user interface, simply and easily. It is
-implemented as a Python extension module (native code) that wraps the
-popular wxWindows cross
-platform GUI library, which is written in C++.
+
wxPython is a GUI toolkit for the Python programming
+language. It allows Python programmers to create programs with a
+robust, highly functional graphical user interface, simply and easily.
+It is implemented as a Python extension module (native code) that
+wraps the popular wxWindows cross platform GUI library, which is
+written in C++.
Like Python and wxWindows, wxPython is Open Source which
means that it is free for anyone to use and the source code is