[Bug 1023955] don't flip to arrow cursor on menus

2 files changed, 21 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ba0c903..5982db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-25  Todd M. Helfter <tmh@users.sourceforge.net>
+
+	* library/menu.tcl : Do not flip to the arrow cursor on menus.
+	This was a Motif convention.  Current behavior is maintained if
+	tk_strictMotif is enabled.  [Bug 1023955]
+
 2008-08-25  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tkImgPhoto.c (ImgPhotoConfigureMaster): Ensure that uses of
diff --git a/library/menu.tcl b/library/menu.tcl
index eda9478..08caeb7 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 2007/12/13 15:26:27 dgp Exp $
+# RCS: @(#) $Id: menu.tcl,v 1.27 2008/08/25 23:01:15 tmh Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -261,8 +261,10 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
     if {$cur ne ""} {
 	MenuUnpost {}
     }
-    set Priv(cursor) [$w cget -cursor]
-    $w configure -cursor arrow
+    if {$tk_stricktMotif} {
+        set Priv(cursor) [$w cget -cursor]
+        $w configure -cursor arrow
+    }
     if {[tk windowingsystem] ne "aqua"} {
 	set Priv(relief) [$w cget -relief]
 	$w configure -relief raised
@@ -409,7 +411,9 @@ proc ::tk::MenuUnpost menu {
 	    set menu [$mb cget -menu]
 	    $menu unpost
 	    set Priv(postedMb) {}
-	    $mb configure -cursor $Priv(cursor)
+	    if {$tk_strictMotif} {
+	        $mb configure -cursor $Priv(cursor)
+	    }
 	    if {[tk windowingsystem] ne "aqua"} {
 		$mb configure -relief $Priv(relief)
 	    } else {
@@ -457,7 +461,9 @@ proc ::tk::MenuUnpost menu {
 	}
 	RestoreOldGrab
 	if {$Priv(menuBar) ne ""} {
-	    $Priv(menuBar) configure -cursor $Priv(cursor)
+	    if {$tk_strictMotif} {
+		$Priv(menuBar) configure -cursor $Priv(cursor)
+	    }
 	    set Priv(menuBar) {}
 	}
 	if {[tk windowingsystem] ne "x11"} {
@@ -590,8 +596,10 @@ proc ::tk::MenuButtonDown menu {
 
 	if {$Priv(menuBar) eq {}} {
 	    set Priv(menuBar) $menu
-	    set Priv(cursor) [$menu cget -cursor]
-	    $menu configure -cursor arrow
+	    if {$tk_strictMotif} {
+		set Priv(cursor) [$menu cget -cursor]
+		$menu configure -cursor arrow
+	    }
         }
 
 	# Don't update grab information if the grab window isn't changing.