X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7aef858828222a05e57671fa01d3cac78aee3ac..b25630fb6c870cc2bd2b465b45e1788a04391e24:/wxPython/demo/Main.py?ds=sidebyside
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 7cd330ffa4..7dfe9cb2f7 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -30,19 +30,9 @@ import images
_treeList = [
# new stuff
- ('Recent Additions', [
- 'VListBox',
- 'Listbook',
- 'MaskedNumCtrl',
+ ('Recent Additions/Updates', [
+ 'OGL',
'FloatCanvas',
- 'XmlResourceSubclass',
- 'GridBagSizer',
- 'Cursor',
- 'PyPlot',
- 'ImageAlpha',
- 'ActiveX_FlashWindow',
- 'ActiveX_IEHtmlWindow',
- 'ActiveX_PDFWindow',
]),
# managed windows == things with a (optional) caption you can close
@@ -261,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):
@@ -271,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)
@@ -445,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)
@@ -743,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)
@@ -953,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