X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7aef858828222a05e57671fa01d3cac78aee3ac..96aecfc900cf46a37eda895860314c494290af19:/wxPython/demo/Main.py?ds=sidebyside
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 7cd330ffa4..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
@@ -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)
@@ -953,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