AGW Logo

svn SVN Revision 69134 For aquabutton

This file contains the SVN revision history for aquabutton, at revision 69134.

Available information include commit date, the name of the committer, the file size, the SVN log messages and a diff from the previous version (if available).


file_info File Information

  • Commit Date: 20-Oct-2008 20:05:15 UTC
  • Committer: AG
  • File Size: 29743 byte(s)

svn_log Log Messages

The following log message was entered by the committer:

  • AquaButton: applied patch from Werner with the option of selecting the disabled colour;
  • FoldPanelBar: Fixed ticket #13485.

svn_diff Diff To Previous Version (69086)

Version SVN diff:

--- wxPython/3rdParty/AGW/agw/aquabutton.py 2011/09/14 19:39:08     69086
+++ wxPython/3rdParty/AGW/agw/aquabutton.py 2011/09/17 22:02:20     69134
@@ -2,7 +2,7 @@
# AQUABUTTON wxPython IMPLEMENTATION
#
# Andrea Gavana, @ 07 October 2008
-# Latest Revision: 17 Aug 2011, 15.00 GMT
+# Latest Revision: 17 Sep 2011, 23.00 GMT
#
#
# TODO List
@@ -100,7 +100,7 @@

L{AquaButton} control is distributed under the wxPython license.

-Latest Revision: Andrea Gavana @ 17 Aug 2011, 15.00 GMT
+Latest Revision: Andrea Gavana @ 17 Sep 2011, 17.00 GMT

Version 0.4

@@ -214,10 +214,12 @@
if "__WXMAC__" in wx.PlatformInfo:
self._backColour = wx.Colour(147, 202, 255)
self._hoverColour = self.LightColour(self._backColour, 30)
+            self._disableColour = self.LightColour(self._backColour, 70)
self._textColour = wx.BLACK
else:
self._backColour = wx.SystemSettings.GetColour(wx.SYS_COLOUR_ACTIVECAPTION)
self._hoverColour = self.LightColour(self._backColour, 30)
+            self._disableColour = self.LightColour(self._backColour, 70)
self._textColour = wx.WHITE


@@ -286,6 +288,9 @@

elif self._mouseAction == HOVER:
clr = self._hoverColour
+
+        elif not self.IsEnabled():
+            clr = self._disableColour

rc1 = wx.Rect(btnOffset, btnOffset, width-8-btnOffset, height-8-btnOffset)
path1 = self.GetPath(gc, rc1, 10)
@@ -709,9 +714,31 @@
return self._hoverColour


+    def SetDisabledColour(self, colour):
+        """
+        Sets the button colour when it is disabled.
+
+        :param `colour`: a valid `wx.Colour` object.
+        """
+
+        self._disableColour = colour
+        self.Invalidate()
+
+
+    def GetDisabledColour(self):
+        """
+        Returns the button colour when it is disabled.
+
+        :return: An instance of `wx.Colour`.
+        """
+
+        return self._disableColour
+
SetBackgroundColor = SetBackgroundColour
SetHoverColor = SetHoverColour
GetHoverColor = GetHoverColour
+    SetDisabledColor = SetDisabledColour
+    GetDisabledColor = GetDisabledColour


def SetForegroundColour(self, colour):
Tree