@matheusbsbs / matheus-bagliano / commits / 3cd204e518
Fork 0

gitk: Fix enabling/disabling of menu items on Mac OS X

It seems that under Mac OS X, the menus get some extra entries (or possibly fewer entries), leading to references to entries by an absolute number being off. This leads to an error when invoking gitk --all under Mac OS X, because the "Edit view" and "Delete view" entries aren't were gitk expects them, and so enabling them gives an error. This changes the code so it refers to menu entries by their content, which should solve the problem. Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras committed Nov 23, 2006 at 21:06 UTC 3cd204e518ce832402c291be73292baa149d0240
1 file changed +10 -10
gitk
+10 -10
@@ -554,7 +554,7 @@ proc makewindow {} {
554 pack .ctop.top.lbar.vlabel -side left -fill y
555 global viewhlmenu selectedhlview
556 set viewhlmenu [tk_optionMenu .ctop.top.lbar.vhl selectedhlview None]
557 - $viewhlmenu entryconf 0 -command delvhighlight
557 + $viewhlmenu entryconf None -command delvhighlight
558 $viewhlmenu conf -font $uifont
559 .ctop.top.lbar.vhl conf -font $uifont
560 pack .ctop.top.lbar.vhl -side left -fill y
@@ -1474,7 +1474,7 @@ proc doviewmenu {m first cmd op argv} {
1474 proc allviewmenus {n op args} {
1475 global viewhlmenu
1476
1477 - doviewmenu .bar.view 7 [list showview $n] $op $args
1477 + doviewmenu .bar.view 5 [list showview $n] $op $args
1478 doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1479 }
1480
@@ -1516,7 +1516,7 @@ proc newviewok {top n} {
1516 set viewperm($n) $newviewperm($n)
1517 if {$newviewname($n) ne $viewname($n)} {
1518 set viewname($n) $newviewname($n)
1519 - doviewmenu .bar.view 7 [list showview $n] \
1519 + doviewmenu .bar.view 5 [list showview $n] \
1520 entryconf [list -label $viewname($n)]
1521 doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
1522 entryconf [list -label $viewname($n) -value $viewname($n)]
@@ -1632,8 +1632,8 @@ proc showview {n} {
1632
1633 set curview $n
1634 set selectedview $n
1635 - .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]
1636 - .bar.view entryconf 3 -state [expr {$n == 0? "disabled": "normal"}]
1635 + .bar.view entryconf Edit* -state [expr {$n == 0? "disabled": "normal"}]
1636 + .bar.view entryconf Delete* -state [expr {$n == 0? "disabled": "normal"}]
1637
1638 if {![info exists viewdata($n)]} {
1639 set pending_select $selid
@@ -4899,9 +4899,9 @@ proc rowmenu {x y id} {
4899 } else {
4900 set state normal
4901 }
4902 - $rowctxmenu entryconfigure 0 -state $state
4903 - $rowctxmenu entryconfigure 1 -state $state
4904 - $rowctxmenu entryconfigure 2 -state $state
4902 + $rowctxmenu entryconfigure "Diff this*" -state $state
4903 + $rowctxmenu entryconfigure "Diff selected*" -state $state
4904 + $rowctxmenu entryconfigure "Make patch" -state $state
4905 set rowmenuid $id
4906 tk_popup $rowctxmenu $x $y
4907 }
@@ -6305,8 +6305,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {}} {
6305 set viewargs(1) $revtreeargs
6306 set viewperm(1) 0
6307 addviewmenu 1
6308 - .bar.view entryconf 2 -state normal
6309 - .bar.view entryconf 3 -state normal
6308 + .bar.view entryconf Edit* -state normal
6309 + .bar.view entryconf Delete* -state normal
6310 }
6311
6312 if {[info exists permviews]} {