summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2009-04-10 16:08:42 (GMT)
committerdas <das>2009-04-10 16:08:42 (GMT)
commit9f2a4345fce2de847fa782dbcf7f5bef0a500c49 (patch)
tree3bbc07f93947edf5c07096c55be7d0f536431361
parentc6b8c8a1001ee5c40918393538134f1fcbff9222 (diff)
downloadtk-9f2a4345fce2de847fa782dbcf7f5bef0a500c49.zip
tk-9f2a4345fce2de847fa782dbcf7f5bef0a500c49.tar.gz
tk-9f2a4345fce2de847fa782dbcf7f5bef0a500c49.tar.bz2
* library/menu.tcl (::tk::MbPost): fix error thrown in y position
computation with indicatoron.
-rw-r--r--ChangeLog5
-rw-r--r--library/menu.tcl6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f9ad1f..410de8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-04-10 Daniel Steffen <das@users.sourceforge.net>
+ * library/menu.tcl (::tk::MbPost): fix error thrown in y position
+ computation with indicatoron.
+
+ * generic/tkMenubutton.c: s/DEF_BUTTON_JUSTIFY/DEF_MENUBUTTON_JUSTIFY/
+
* generic/tkUtil.c (TkBackgroundEvalObjv): use Tcl_BackgroundException.
* generic/tkBind.c (HandleEventGenerate): ensure window exists before
diff --git a/library/menu.tcl b/library/menu.tcl
index 79aa199..b80af90 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.31 2008/09/09 18:17:54 tmh Exp $
+# RCS: @(#) $Id: menu.tcl,v 1.32 2009/04/10 16:08:42 das Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -307,7 +307,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}]
set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
set entry [MenuFindName $menu [$w cget -text]]
- if {[$w cget -indicatoron]} {
+ if {[$w cget -indicatoron] && $entry ne ""} {
if {$entry == [$menu index last]} {
incr y [expr {-([$menu yposition $entry] \
+ [winfo reqheight $menu])/2}]
@@ -327,7 +327,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
set x [expr {[winfo rootx $w] + [winfo width $w]}]
set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
set entry [MenuFindName $menu [$w cget -text]]
- if {[$w cget -indicatoron]} {
+ if {[$w cget -indicatoron] && $entry ne ""} {
if {$entry == [$menu index last]} {
incr y [expr {-([$menu yposition $entry] \
+ [winfo reqheight $menu])/2}]