Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -29,10 +29,16 @@ class TestPanel(wx.Panel):
 | 
			
		||||
            mask = wx.Mask(bmp, wx.BLUE)
 | 
			
		||||
 | 
			
		||||
        bmp.SetMask(mask)
 | 
			
		||||
        b = wx.BitmapButton(self, 30, bmp, (20, 20),
 | 
			
		||||
        b = wx.BitmapButton(self, -1, bmp, (20, 20),
 | 
			
		||||
                       (bmp.GetWidth()+10, bmp.GetHeight()+10))
 | 
			
		||||
        b.SetToolTipString("This is a bitmap button.")
 | 
			
		||||
        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
 | 
			
		||||
 | 
			
		||||
        b = wx.BitmapButton(self, -1, bmp, (20, 120),
 | 
			
		||||
                       (bmp.GetWidth()+10, bmp.GetHeight()+10),
 | 
			
		||||
                        style = wx.NO_BORDER)
 | 
			
		||||
        b.SetToolTipString("This is a bitmap button with \nwx.NO_BORDER style.")
 | 
			
		||||
        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
    def OnClick(self, event):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user