summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-05-04 17:17:33 (GMT)
committerjenglish <jenglish@flightlab.com>2008-05-04 17:17:33 (GMT)
commit4ed1eb5d0267fed22ad66b46746e21adf8b6db53 (patch)
tree1bfb35524f23254008db5ed8b106c1175b892ac6
parent928356b19cc8e6012f2b30356855895085b34439 (diff)
downloadtk-4ed1eb5d0267fed22ad66b46746e21adf8b6db53.zip
tk-4ed1eb5d0267fed22ad66b46746e21adf8b6db53.tar.gz
tk-4ed1eb5d0267fed22ad66b46746e21adf8b6db53.tar.bz2
"default" and "focus" adornments should not be disjoint [Bug 1942785]
-rw-r--r--ChangeLog5
-rw-r--r--macosx/ttkMacOSXTheme.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b954a8c..637c05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-04 Joe English <jenglish@users.sourceforge.net>
+
+ * macosx/ttkMacOSAquaTheme.c: "default" and "focus" adornments
+ should not be disjoint [Bug 1942785]
+
2008-04-27 Donal K. Fellows <dkf@users.sf.net>
* */*.c: A large tranche of getting rid of pre-C89-isms; if your
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 585221c..61fb213 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -27,7 +27,7 @@
* top-level window, not to the Tk_Window. BoxToRect()
* accounts for this.
*
- * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.21 2007/12/13 15:27:10 dgp Exp $
+ * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.22 2008/05/04 17:17:33 jenglish Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -160,6 +160,8 @@ static Ttk_StateTable ButtonValueTable[] = {
};
static Ttk_StateTable ButtonAdornmentTable[] = {
+ { kThemeAdornmentDefault| kThemeAdornmentFocus,
+ TTK_STATE_ALTERNATE| TTK_STATE_FOCUS, 0 },
{ kThemeAdornmentDefault, TTK_STATE_ALTERNATE, 0 },
{ kThemeAdornmentFocus, TTK_STATE_FOCUS, 0 },
{ kThemeAdornmentNone, 0, 0 }