Merge 8.6

6 files changed, 17 insertions, 17 deletions

diff --git a/tests/menubut.test b/tests/menubut.test
index ac479ab..e5b39a2 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -542,7 +542,7 @@ test menubutton-6.1 {MenuButtonCmdDeletedProc procedure} -setup {
     deleteWindows
 } -result {{} {}}
 
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     set extraWidth 36
 } else {
     set extraWidth 0
diff --git a/tests/text.test b/tests/text.test
index b3f2082..751d90b 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -3487,7 +3487,7 @@ test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
 # The "overrideredirect" gets rid of the titlebar so the toplevel can shrink
 # to the appropriate size.
 # On macOS, however, there is no way to make the window overlap the menubar.
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     set minY [expr [menubarheight] + 1]
 } else {
     set minY 0
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 8fd2edf..079d8af 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -721,7 +721,7 @@ test textDisp-4.4 {UpdateDisplayInfo, wrap-mode "none"} {
 	[list [xchar 0] [yline 3] $fixedWidth  $fixedHeight] \
 	{1.0 2.0 3.0}]
 test textDisp-4.5 {UpdateDisplayInfo, tiny window} {
-    if {[tk windowingsystem] == "win32"} {
+    if {[tk windowingsystem] eq "win32"} {
 	wm overrideredirect . 1
     }
     wm geom . 103x$height
@@ -735,7 +735,7 @@ test textDisp-4.5 {UpdateDisplayInfo, tiny window} {
         {} \
 	[list [xchar 0] [yline 3] 1 $fixedHeight] \
 	{1.0 2.0 3.0}]
-if {[tk windowingsystem] == "win32"} {
+if {[tk windowingsystem] eq "win32"} {
     wm overrideredirect . 0
 }
 test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
@@ -746,7 +746,7 @@ test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
 
-    if {[tk windowingsystem] == "win32"} {
+    if {[tk windowingsystem] eq "win32"} {
 	wm overrideredirect . 1
     }
     frame .f2 -width 20 -height 100
@@ -775,7 +775,7 @@ test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
 
-    if {[tk windowingsystem] == "win32"} {
+    if {[tk windowingsystem] eq "win32"} {
 	wm overrideredirect . 1
     }
     .t delete 1.0 end
@@ -3737,7 +3737,7 @@ test textDisp-24.15 {TkTextCharLayoutProc, -wrap none} {
     lequal [list [.t bbox 1.19] [.t bbox 1.20]] $expected
 } {1}
 test textDisp-24.16 {TkTextCharLayoutProc, no chars fit} {
-    if {[tk windowingsystem] == "win32"} {
+    if {[tk windowingsystem] eq "win32"} {
 	wm overrideredirect . 1
     }
     .t configure -wrap char
@@ -3751,7 +3751,7 @@ test textDisp-24.16 {TkTextCharLayoutProc, no chars fit} {
 } [list [list [xchar 0] [yline 1] 1 $fixedHeight] \
         [list [xchar 0] [yline 2] 1 $fixedHeight] \
 	[list [xchar 0] [yline 3] 1 $fixedHeight]]
-if {[tk windowingsystem] == "win32"} {
+if {[tk windowingsystem] eq "win32"} {
     wm overrideredirect . 0
 }
 test textDisp-24.17 {TkTextCharLayoutProc, -wrap word} {
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 55824d7..17e8bc0 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -19,7 +19,7 @@ testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowi
 # Starting with macOS Ventura it became necessary to wait for windows to be restacked
 # or to be raised after creation.
 
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     proc restackDelay {} {
 	after 100;
     }
@@ -829,7 +829,7 @@ test unixWm-22.2 {Tk_WmCmd procedure, "iconbitmap" option} {unix testwrapper} {
 	    WM_HINTS] 0]]]
     lappend result [wm iconbitmap .t] $bit
 } {{} questhead 0x4 {} 0x0}
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     set result_22_3 {0 {}}
 } else {
     set result_22_3 {1 {bitmap "bad-bitmap" not defined}}
@@ -1240,7 +1240,7 @@ test unixWm-34.2 {Tk_WmCmd procedure, "sizefrom" option} {unix testwrapper} {
 test unixWm-34.3 {Tk_WmCmd procedure, "sizefrom" option} unix {
     list [catch {wm sizefrom .t none} msg]  $msg
 } {1 {bad argument "none": must be program or user}}
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     set result_35_1 {1 {bad argument "1": must be iconic, normal, withdrawn, or zoomed}}
 } else {
     set result_35_1 {1 {bad argument "1": must be iconic, normal, or withdrawn}}
@@ -1802,7 +1802,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
 
 deleteWindows
 wm withdraw .
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     # Modern mac windows have no border.
     set result_50_1 {{} {} .t .t .t2 {} .t2 .t .t}
 } else {
@@ -2122,7 +2122,7 @@ test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} unix
     lappend result [winfo containing $x $y]
 } {.t2 .t .t2}
 # The mac won't put an overrideredirect window above the root,
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     wm withdraw .
 }
 test unixWm-51.9 {TkWmRestackToplevel procedure, other window overrideredirect} unix {
@@ -2151,7 +2151,7 @@ test unixWm-51.9 {TkWmRestackToplevel procedure, other window overrideredirect}
     restackDelay
     lappend result [winfo containing $x $y]
 } {.t2 .t3}
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     wm deiconify .
 }
 test unixWm-51.10 {TkWmRestackToplevel procedure, don't move window that's already in the right place} unix {
@@ -2529,7 +2529,7 @@ test unixWm-59.3 {exit processing} unix {
 # NOTE: since [wm attributes] is not guaranteed to have any effect,
 # the only thing we can really test here is the syntax.
 #
-if {[tk windowingsystem] == "aqua"} {
+if {[tk windowingsystem] eq "aqua"} {
     set result_60_1 {-alpha 1.0 -fullscreen 0 -modified 0 -notify 0\
 			 -titlepath {} -topmost 0 -transparent 0\
 			 -type unsupported}
diff --git a/tests/winfo.test b/tests/winfo.test
index ae0af64..d4cc1ff 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -399,7 +399,7 @@ test winfo-13.1 {root coordinates of embedded toplevel} -setup {
 
 # Windows does not destroy the container when an embedded window is
 # destroyed.  Unix and macOS do destroy it.  See ticket [67384bce7d].
-if {[tk windowingsystem] == "win32"} {
+if {[tk windowingsystem] eq "win32"} {
    set result_13_2 {embedded 0 container 1}
 } else {
    set result_13_2 {embedded 0 container 0}
diff --git a/tests/wm.test b/tests/wm.test
index 68c15e8..71d7204 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -2456,7 +2456,7 @@ test wm-forget-1.4 "pack into unmapped toplevel causes crash" -body {
 test wm-forget-2 {bug [e9112ef96e] - [wm forget] doesn't completely} -setup {
     catch {destroy .l .f.b .f}
     set res {}
-    if {[tk windowingsystem] == "aqua"} {
+    if {[tk windowingsystem] eq "aqua"} {
 	proc doUpdate {} {update idletasks}
     } else {
 	proc doUpdate {} {update}