little tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index cce8c7b333ed0d62190d3b3b7651e8e71fb9d691..ba79bc8e44e569b45694afc0eb4e3f10fdc5c753 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -251,7 +251,7 @@ class MyTP(wx.PyTipProvider):
 #
 
 try:
 #
 
 try:

-    ##raise ImportError
+    ##raise ImportError     # for testing the alternate implementation

     from wx import stc
     from StyledTextCtrl_2 import PythonSTC
     class DemoCodeViewer(PythonSTC):
     from wx import stc
     from StyledTextCtrl_2 import PythonSTC
     class DemoCodeViewer(PythonSTC):


@@ -435,12 +435,9 @@ class wxPythonDemo(wx.Frame):
 
         if wx.Platform != '__WXMAC__':
             # setup a taskbar icon, and catch some events from it
 
         if wx.Platform != '__WXMAC__':
             # setup a taskbar icon, and catch some events from it

-            if wx.Platform == '__WXGTK__':
-                dimension = 22
-            else:
-                dimension = 16
+            dim = 16  # (may want to use 22 on wxGTK...)

             icon = wx.IconFromBitmap(
             icon = wx.IconFromBitmap(

-                images.getMondrianImage().Scale(dimension,dimension).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()
             #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
             #icon = images.getMondrianIcon()
             self.tbicon = wx.TaskBarIcon()