From 4ed1eb5d0267fed22ad66b46746e21adf8b6db53 Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Sun, 4 May 2008 17:17:33 +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 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 }
-- 
cgit v0.12