From 8a44d010fe0fe2f1b6787480556519e67e5458f2 Mon Sep 17 00:00:00 2001 From: tmh Date: Tue, 9 Sep 2008 18:17:08 +0000 Subject: a final fix --- library/menu.tcl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/library/menu.tcl b/library/menu.tcl index b5524dc..c5b7ca7 100644 --- a/library/menu.tcl +++ b/library/menu.tcl @@ -4,7 +4,7 @@ # It also implements keyboard traversal of menus and implements a few # other utility procedures related to menus. # -# RCS: @(#) $Id: menu.tcl,v 1.26.2.3 2008/09/09 17:47:21 tmh Exp $ +# RCS: @(#) $Id: menu.tcl,v 1.26.2.4 2008/09/09 18:17:08 tmh Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -243,7 +243,7 @@ proc ::tk::MbLeave w { proc ::tk::MbPost {w {x {}} {y {}}} { global errorInfo variable ::tk::Priv - global tcl_platform tk_strictMotif + global tcl_platform if {[$w cget -state] eq "disabled" || $w eq $Priv(postedMb)} { return @@ -261,7 +261,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { if {$cur ne ""} { MenuUnpost {} } - if {$tk_strictMotif} { + if {$::tk_strictMotif} { set Priv(cursor) [$w cget -cursor] $w configure -cursor arrow } @@ -392,7 +392,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { # is a posted menubutton. proc ::tk::MenuUnpost menu { - global tcl_platform tk_strictMotif + global tcl_platform variable ::tk::Priv set mb $Priv(postedMb) @@ -411,7 +411,7 @@ proc ::tk::MenuUnpost menu { set menu [$mb cget -menu] $menu unpost set Priv(postedMb) {} - if {$tk_strictMotif} { + if {$::tk_strictMotif} { $mb configure -cursor $Priv(cursor) } if {[tk windowingsystem] ne "aqua"} { @@ -461,7 +461,7 @@ proc ::tk::MenuUnpost menu { } RestoreOldGrab if {$Priv(menuBar) ne ""} { - if {$tk_strictMotif} { + if {$::tk_strictMotif} { $Priv(menuBar) configure -cursor $Priv(cursor) } set Priv(menuBar) {} @@ -579,7 +579,7 @@ proc ::tk::MenuMotion {menu x y state} { proc ::tk::MenuButtonDown menu { variable ::tk::Priv - global tcl_platform tk_strictMotif + global tcl_platform if {![winfo viewable $menu]} { return @@ -596,7 +596,7 @@ proc ::tk::MenuButtonDown menu { if {$Priv(menuBar) eq {}} { set Priv(menuBar) $menu - if {$tk_strictMotif} { + if {$::tk_strictMotif} { set Priv(cursor) [$menu cget -cursor] $menu configure -cursor arrow } -- cgit v0.12