wxHtmlHelpController made compatible with other controllers

[wxWidgets.git] / utils / wxPython / lib / buttons.py

diff --git a/utils/wxPython/lib/buttons.py b/utils/wxPython/lib/buttons.py
index 9c4a79110a833d60cf8133e1c9a09b218cc80166..7d63710314137c368540fa330fc97155a6d5a311 100644 (file)
--- a/utils/wxPython/lib/buttons.py
+++ b/utils/wxPython/lib/buttons.py
@@ -232,6 +232,7 @@ class wxGenButton(wxControl):
         if self.hasFocus and self.useFocusInd:
             self.DrawFocusIndicator(dc, width, height)
 
+
     def OnEraseBackground(self, event):
         pass
 
@@ -293,6 +294,7 @@ class wxGenButton(wxControl):
             self.Refresh()
         event.Skip()
 
+
     def OnKeyUp(self, event):
         if self.hasFocus and event.KeyCode() == ord(" "):
             self.up = true
@@ -361,7 +363,8 @@ class wxGenBitmapButton(wxGenButton):
         bw,bh = bmp.GetWidth(), bmp.GetHeight()
         if not self.up:
             dw = dy = 1
-        dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, true)
+        hasMask = bmp.GetMask() != None
+        dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, hasMask)
 
 
 
@@ -378,6 +381,7 @@ class __ToggleMixin:
     def OnLeftDown(self, event):
         if not self.IsEnabled():
             return
+        self.saveUp = self.up
         self.up = not self.up
         self.CaptureMouse()
         self.SetFocus()
@@ -386,7 +390,8 @@ class __ToggleMixin:
     def OnLeftUp(self, event):
         if not self.IsEnabled():
             return
-        self.Notify()
+        if self.up != self.saveUp:
+            self.Notify()
         self.ReleaseMouse()
         self.Refresh()