Various testing changes

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

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 7b83f581fa5f6b9da1f7edbcd1bc80584af10e74..560cfb8001c486c373b4a552001691c055ebba35 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -18,6 +18,7 @@ on the command line.
 """
 
 import wx                  # This module uses the new wx namespace
 """
 
 import wx                  # This module uses the new wx namespace

+print "wx.VERSION_STRING = ", wx.VERSION_STRING

 
 import sys, os
 
 
 import sys, os
 

diff --git a/wxPython/demo/wxMenu.py b/wxPython/demo/wxMenu.py
index c209977197e72faea56eaf856048645fc5e6dff4..2cb0ce60e18638542ce6daa31f95ae9ada437093 100644 (file)
--- a/wxPython/demo/wxMenu.py
+++ b/wxPython/demo/wxMenu.py
@@ -6,7 +6,7 @@
 #-------------------------------------------------------------------
 
 from wxPython.wx import *
 #-------------------------------------------------------------------
 
 from wxPython.wx import *

-
+import images

 import time
 
 #-------------------------------------------------------------------
 import time
 
 #-------------------------------------------------------------------


@@ -69,6 +69,11 @@ check the source for this sample to see how to implement them.
         menuBar.Append(menu4, "Chec&k")
 
         menu5 = wxMenu()
         menuBar.Append(menu4, "Chec&k")
 
         menu5 = wxMenu()

+        # Show how to put an icon in the menu
+        item = wxMenuItem(menu5, 500, "&Smile!\tCtrl+S", "This one has an icon")
+        item.SetBitmap(images.getSmilesBitmap())
+        menu5.AppendItem(item)
+

         menu5.Append(501, "Interesting thing\tCtrl+A", "Note the shortcut!")
         menu5.AppendSeparator()
         menu5.Append(502, "Hello\tShift+H")
         menu5.Append(501, "Interesting thing\tCtrl+A", "Note the shortcut!")
         menu5.AppendSeparator()
         menu5.Append(502, "Hello\tShift+H")


@@ -107,6 +112,7 @@ check the source for this sample to see how to implement them.
 
         EVT_MENU_RANGE(self, 401, 403, self.Menu401To403)
 
 
         EVT_MENU_RANGE(self, 401, 403, self.Menu401To403)
 

+        EVT_MENU(self, 500, self.Menu500)

         EVT_MENU(self, 501, self.Menu501)
         EVT_MENU(self, 502, self.Menu502)
         EVT_MENU(self, 503, self.TestRemove)
         EVT_MENU(self, 501, self.Menu501)
         EVT_MENU(self, 502, self.Menu502)
         EVT_MENU(self, 503, self.TestRemove)


@@ -168,6 +174,9 @@ check the source for this sample to see how to implement them.
     def Menu401To403(self, event):
         self.log.write('From a EVT_MENU_RANGE event\n')
 
     def Menu401To403(self, event):
         self.log.write('From a EVT_MENU_RANGE event\n')
 

+    def Menu500(self, event):
+        self.log.write('Have a happy day!\n')
+

     def Menu501(self, event):
         self.log.write('Look in the code how the shortcut has been realized\n')
 
     def Menu501(self, event):
         self.log.write('Look in the code how the shortcut has been realized\n')