From d9aeb17bc875cb8fc6d1575fd094c619385526e7 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 5 Mar 2021 16:15:21 +0000
Subject: Fix [58222c42b3]: ttk::entry has wrong default
 background/fieldbackground

---
 library/ttk/aquaTheme.tcl |  4 ++++
 macosx/tkMacOSXDefault.h  | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index 3ccdd70..bba1aae 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -42,6 +42,10 @@ namespace eval ttk::theme::aqua {
 	# so we only need to specify !focus.)
 
 	# Entry
+	ttk::style configure TEntry \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor \
+	    -fieldbackground systemTextBackgroundColor
 	ttk::style map TEntry \
 	    -foreground {
 		disabled systemDisabledControlTextColor
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index af0a06b..334fa0a 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -173,17 +173,17 @@
 #define DEF_ENTRY_EXPORT_SELECTION	"1"
 #define DEF_ENTRY_FONT			"TkTextFont"
 #define DEF_ENTRY_FG			NORMAL_FG
-#define DEF_ENTRY_HIGHLIGHT_BG		NORMAL_BG
+#define DEF_ENTRY_HIGHLIGHT_BG		TEXT_BG
 #define DEF_ENTRY_HIGHLIGHT		BLACK
 #define DEF_ENTRY_HIGHLIGHT_WIDTH	"3"
-#define DEF_ENTRY_INSERT_BG		NORMAL_FG
+#define DEF_ENTRY_INSERT_BG		TEXT_BG
 #define DEF_ENTRY_INSERT_BD_COLOR	"0"
 #define DEF_ENTRY_INSERT_BD_MONO	"0"
 #define DEF_ENTRY_INSERT_OFF_TIME	"300"
 #define DEF_ENTRY_INSERT_ON_TIME	"600"
 #define DEF_ENTRY_INSERT_WIDTH		"1"
 #define DEF_ENTRY_JUSTIFY		"left"
-#define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
+#define DEF_ENTRY_READONLY_BG_COLOR	TEXT_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
 #define DEF_ENTRY_SCROLL_COMMAND	""
@@ -500,8 +500,8 @@
 #define DEF_TEXT_EXPORT_SELECTION	"1"
 #define DEF_TEXT_FONT			"TkFixedFont"
 #define DEF_TEXT_HEIGHT			"24"
-#define DEF_TEXT_HIGHLIGHT_BG		NORMAL_BG
-#define DEF_TEXT_HIGHLIGHT		BLACK
+#define DEF_TEXT_HIGHLIGHT_BG		TEXT_BG
+#define DEF_TEXT_HIGHLIGHT		NORMAL_FG
 #define DEF_TEXT_HIGHLIGHT_WIDTH	"3"
 #define DEF_TEXT_INSERT_BG		NORMAL_FG
 #define DEF_TEXT_INSERT_BD_COLOR	"0"
-- 
cgit v0.12


From 77c7015f5d5b6a979514730a4fe527c2447e1cbf Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 7 Apr 2021 15:34:29 +0000
Subject: Fix the background for ttk::spinbox too.

---
 library/ttk/aquaTheme.tcl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index bba1aae..9896021 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -64,6 +64,10 @@ namespace eval ttk::theme::aqua {
 	    }
 
 	# Spinbox
+	ttk::style configure TSpinbox \
+	    -foreground systemTextColor \
+	    -background systemTextBackgroundColor \
+	    -fieldbackground systemTextBackgroundColor
 	ttk::style map TSpinbox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
-- 
cgit v0.12