X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef8b9c3eb8259b8e5673b46f526b0da3b363927e..85f6b408dfd796805b1c43718e69549506353ca7:/wxPython/demo/Main.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 349a1a6712..884b8ee32c 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -30,19 +30,8 @@ import images
_treeList = [
# new stuff
- ('Recent Additions', [
- 'VListBox',
- 'Listbook',
- 'MaskedNumCtrl',
- 'FloatCanvas',
- 'XmlResourceSubclass',
- 'GridBagSizer',
- 'Cursor',
- 'PyPlot',
- 'ImageAlpha',
- 'ActiveX_FlashWindow',
- 'ActiveX_IEHtmlWindow',
- 'ActiveX_PDFWindow',
+ ('Recent Additions and Updates', [
+ 'OGL',
]),
# managed windows == things with a (optional) caption you can close
@@ -221,7 +210,7 @@ _treeList = [
]),
# need libs not coming with the demo
- ('Objects using an external library', [
+ ('Samples using an external library', [
'GLCanvas',
]),
@@ -445,8 +434,14 @@ class wxPythonDemo(wx.Frame):
if wx.Platform != '__WXMAC__':
# setup a taskbar icon, and catch some events from it
+ if wx.Platform == '__WXGTK__':
+ dimension = 22
+ else:
+ dimension = 16
icon = wx.IconFromBitmap(
- images.getMondrianImage().Scale(16,16).ConvertToBitmap() )
+ images.getMondrianImage().Scale(dimension,dimension).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)
@@ -465,8 +460,8 @@ class wxPythonDemo(wx.Frame):
self.Centre(wx.BOTH)
self.CreateStatusBar(1, wx.ST_SIZEGRIP)
- splitter = wx.SplitterWindow(self, -1, style=wx.CLIP_CHILDREN)
- splitter2 = wx.SplitterWindow(splitter, -1, style=wx.CLIP_CHILDREN)
+ 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,
@@ -921,14 +916,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 +948,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