From 158f5fd9a87c851bcaaefa94689eefdd9c8d4b59 Mon Sep 17 00:00:00 2001 From: jenglish Date: Sun, 4 May 2008 17:16:50 +0000 Subject: "default" and "focus" adornments should not be disjoint [Bug 1942785] --- ChangeLog | 5 +++++ macosx/ttkMacOSXTheme.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d78fdf9..ce03014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-04 Joe English + + * macosx/ttkMacOSAquaTheme.c: "default" and "focus" adornments + should not be disjoint [Bug 1942785] + 2008-04-17 Don Porter * generic/tkCanvas.c: Fix logic that determines when canvas item diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 585221c..042ab98 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.21.2.1 2008/05/04 17:16:51 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 } -- cgit v0.12