merged trunk

1 files changed, 19 insertions, 2 deletions

diff --git a/tests/menu.test b/tests/menu.test
index 595a21b..aaadc86 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -1548,10 +1548,15 @@ test menu-3.41 {MenuWidgetCmd procedure, "index" option} -setup {
 } -body {
     menu .m1
     .m1 add command -label "test"
-    .m1 index "test"
+    .m1 add command -label "3"
+    .m1 add command -label "another label"
+    .m1 add command -label "end"
+    .m1 add command -label "3a"
+    .m1 add command -label "final entry"
+    list [.m1 index "test"] [.m1 index "3"] [.m1 index "3a"] [.m1 index "end"]
 } -cleanup {
 	destroy .m1
-} -result {1}
+} -result {1 3 5 6}
 test menu-3.42 {MenuWidgetCmd procedure, "insert" option} -setup {
 	destroy .m1
 } -body {
@@ -3862,6 +3867,18 @@ test menu-35.1 {menu -underline string overruns Bug 1599877} -setup {
 	deleteWindows
 } -result {}
 
+test menu-37.1 {menubar menues cannot be posted - bug 2160206} -setup {
+    catch {destroy .m}
+} -body {
+    # On Linux the following used to panic
+    # It now returns an error (on all platforms)
+    menu .m -type menubar
+    list [catch ".m post 1 1" msg] $msg
+} -cleanup {
+    destroy .m
+} -result {1 {a menubar menu cannot be posted}}
+
+
 # cleanup
 imageFinish
 deleteWindows