Merge 8.7

7 files changed, 5 insertions, 9 deletions

diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index c279ed8..85d65e9 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1252,9 +1252,9 @@ static void EntryDisplay(void *clientData, Drawable d)
 	Tk_3DBorder selBorder = Tk_Get3DBorderFromObj(tkwin, es.selBorderObj);
 	int selStartX = EntryCharPosition(entryPtr, selFirst);
 	int selEndX = EntryCharPosition(entryPtr, selLast);
-	int borderWidth = 1;
+	int borderWidth = 0;
 
-	Tcl_GetIntFromObj(NULL, es.selBorderWidthObj, &borderWidth);
+	Tk_GetPixelsFromObj(NULL, tkwin, es.selBorderWidthObj, &borderWidth);
 
 	if (selBorder) {
 	    Tk_Fill3DRectangle(tkwin, d, selBorder,
@@ -1288,7 +1288,7 @@ static void EntryDisplay(void *clientData, Drawable d)
 	    cursorHeight = entryPtr->entry.layoutHeight,
 	    cursorWidth = 1;
 
-	Tcl_GetIntFromObj(NULL,es.insertWidthObj,&cursorWidth);
+	Tk_GetPixelsFromObj(NULL, tkwin, es.insertWidthObj, &cursorWidth);
 	if (cursorWidth <= 0) {
 	    cursorWidth = 1;
 	}
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index f8198cc..8c771ee 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -189,7 +189,7 @@ static void NotebookStyleOptions(
 
     nbstyle->minTabWidth = DEFAULT_MIN_TAB_WIDTH;
     if ((objPtr = Ttk_QueryOption(nb->core.layout, "-mintabwidth", 0)) != 0) {
-	Tcl_GetIntFromObj(NULL, objPtr, &nbstyle->minTabWidth);
+	Tk_GetPixelsFromObj(NULL, tkwin, objPtr, &nbstyle->minTabWidth);
     }
 }
 
diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index 06b8769..a631376 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -11,7 +11,6 @@ namespace eval ttk::theme::aqua {
 	    -foreground systemLabelColor \
 	    -selectbackground systemSelectedTextBackgroundColor \
 	    -selectforeground systemSelectedTextColor \
-	    -selectborderwidth 0 \
 	    -insertwidth 1
 
 	ttk::style map . \
diff --git a/library/ttk/clamTheme.tcl b/library/ttk/clamTheme.tcl
index f4644ee..be72290 100644
--- a/library/ttk/clamTheme.tcl
+++ b/library/ttk/clamTheme.tcl
@@ -33,7 +33,6 @@ namespace eval ttk::theme::clam {
 	    -troughcolor $colors(-darker) \
 	    -selectbackground $colors(-selectbg) \
 	    -selectforeground $colors(-selectfg) \
-	    -selectborderwidth 0 \
 	    -font TkDefaultFont
 
 	ttk::style map "." \
diff --git a/library/ttk/classicTheme.tcl b/library/ttk/classicTheme.tcl
index 575e899..7964034 100644
--- a/library/ttk/classicTheme.tcl
+++ b/library/ttk/classicTheme.tcl
@@ -31,7 +31,6 @@ namespace eval ttk::theme::classic {
 	    -indicatorcolor	$colors(-frame) \
 	    -highlightcolor	$colors(-frame) \
 	    -highlightthickness	1 \
-	    -selectborderwidth	0 \
 	    -borderwidth	1 \
 	    -insertwidth	2 \
 	    -focuswidth		0
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl
index 58c8c18..226bd39 100644
--- a/library/ttk/defaults.tcl
+++ b/library/ttk/defaults.tcl
@@ -90,7 +90,6 @@ proc ttk::theme::default::reconfigureDefaultTheme {} {
 	    -foreground 	$colors(-foreground) \
 	    -troughcolor 	$colors(-darker) \
 	    -font 		TkDefaultFont \
-	    -selectborderwidth	0 \
 	    -selectbackground	$colors(-selectbg) \
 	    -selectforeground	$colors(-selectfg) \
 	    -insertwidth 	1 \
diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl
index ec833bf..3be8add 100644
--- a/library/ttk/winTheme.tcl
+++ b/library/ttk/winTheme.tcl
@@ -30,7 +30,7 @@ namespace eval ttk::theme::winnative {
 	    -padding {6p 3p} -arrowsize 2.25p -relief raised
 
 	ttk::style configure TEntry \
-	    -padding 2 -selectborderwidth 0 -insertwidth 1
+	    -padding 2 -insertwidth 1
 	ttk::style map TEntry \
 	    -fieldbackground \
 		{readonly SystemButtonFace disabled SystemButtonFace} \