fixed array tests compilation and a bug in obj array test

[wxWidgets.git] / wxPython / demo / wxButton.py

diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/wxButton.py
index b9bdc0bbc7082198da8a95a1c7ceff6866319711..2c763d7f70b4178a7a4856c115cb7df4b5509880 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -1,6 +1,8 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

+import images
+

 #----------------------------------------------------------------------
 
 class TestPanel(wxPanel):
 #----------------------------------------------------------------------
 
 class TestPanel(wxPanel):


@@ -14,21 +16,19 @@ class TestPanel(wxPanel):
         b.SetForegroundColour(wxWHITE)
         b.SetDefault()
 
         b.SetForegroundColour(wxWHITE)
         b.SetDefault()
 

-        wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
+        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))

         EVT_BUTTON(self, 20, self.OnClick)
 
         EVT_BUTTON(self, 20, self.OnClick)
 

-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        b.SetToolTipString("This is a Hello button...")

 
 

+        bmp = images.getTest2Bitmap()

         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
 
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
 

-        print bmp.GetWidth(), bmp.GetHeight()
-

         wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)
 
         wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)
 

-

     def OnClick(self, event):
         self.log.WriteText("Click! (%d)\n" % event.GetId())
 
     def OnClick(self, event):
         self.log.WriteText("Click! (%d)\n" % event.GetId())