fixed array tests compilation and a bug in obj array test

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

diff --git a/wxPython/demo/GenericButtons.py b/wxPython/demo/GenericButtons.py
index ccdf0ef34af4ab775fb1c1ba4662fa3fbb3f564d..c11d7a5b8ce3b9054781db9676137cbefc1261c7 100644 (file)
--- a/wxPython/demo/GenericButtons.py
+++ b/wxPython/demo/GenericButtons.py
@@ -1,8 +1,8 @@
 
 from wxPython.wx import *
 
 from wxPython.wx import *

-from wxPython.lib.buttons import wxGenButton, wxGenBitmapButton, \
-                                 wxGenToggleButton, wxGenBitmapToggleButton
+from wxPython.lib.buttons import *

 
 

+import images

 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
 


@@ -34,18 +34,18 @@ class TestPanel(wxPanel):
         #b.SetUseFocusIndicator(false)
         b.SetToolTipString("This is a BIG button...")
 
         #b.SetUseFocusIndicator(false)
         b.SetToolTipString("This is a BIG button...")
 

-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getTest2Bitmap()

         b = wxGenBitmapButton(self, -1, bmp, (10, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
 
 
         b = wxGenBitmapButton(self, -1, None, (140, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         b = wxGenBitmapButton(self, -1, bmp, (10, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
 
 
         b = wxGenBitmapButton(self, -1, None, (140, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)

-        bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getBulb1Bitmap()

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

-        bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getBulb2Bitmap()

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


@@ -57,17 +57,30 @@ class TestPanel(wxPanel):
 
         b = wxGenBitmapToggleButton(self, -1, None, (140, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
 
         b = wxGenBitmapToggleButton(self, -1, None, (140, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)

-        bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getBulb1Bitmap()

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

-        bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getBulb2Bitmap()

         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetToggle(true)
         b.SetBestSize()
 
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetToggle(true)
         b.SetBestSize()
 

+        b = wxGenBitmapTextButton(self, -1, None, "Bitmapped Text", (220, 230), size = (200, 45))
+        EVT_BUTTON(self, b.GetId(), self.OnButton)
+        bmp = images.getBulb1Bitmap()
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
+        b.SetBitmapLabel(bmp)
+        bmp = images.getBulb2Bitmap()
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
+        b.SetBitmapSelected(bmp)
+        b.SetUseFocusIndicator(false)
+        b.SetBestSize()
+

 
     def OnButton(self, event):
         self.log.WriteText("Button Clicked: %d\n" % event.GetId())
 
     def OnButton(self, event):
         self.log.WriteText("Button Clicked: %d\n" % event.GetId())