diff options
author | das <das> | 2009-04-10 16:16:02 (GMT) |
---|---|---|
committer | das <das> | 2009-04-10 16:16:02 (GMT) |
commit | 5f64f944d857c008dc425c4cac6ad54ce12aea5b (patch) | |
tree | 706b94572ea5280f5cfb985792cc4b61358508d6 | |
parent | f730df00ad6995359ca5bcfab11a85e8a0edb271 (diff) | |
download | tk-5f64f944d857c008dc425c4cac6ad54ce12aea5b.zip tk-5f64f944d857c008dc425c4cac6ad54ce12aea5b.tar.gz tk-5f64f944d857c008dc425c4cac6ad54ce12aea5b.tar.bz2 |
* generic/tkMenu.c (PostProcessEntry): delay call to
TkpConfigureMenuEntry() until all menu entry attributes are setup.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | generic/tkMenu.c | 10 |
2 files changed, 8 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2008-04-10 Daniel Steffen <das@users.sourceforge.net> + * generic/tkMenu.c (PostProcessEntry): delay call to + TkpConfigureMenuEntry() until all menu entry attributes are setup. + * library/menu.tcl (::tk::MbPost): fix error thrown in y position computation with indicatoron. diff --git a/generic/tkMenu.c b/generic/tkMenu.c index fa2959f..ac90f0a 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMenu.c,v 1.50 2009/02/06 08:12:07 das Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.51 2009/04/10 16:16:02 das Exp $ */ /* @@ -1784,10 +1784,6 @@ PostProcessEntry( return TCL_ERROR; } - if (TkpConfigureMenuEntry(mePtr) != TCL_OK) { - return TCL_ERROR; - } - /* * Get the images for the entry, if there are any. Allocate the new images * before freeing the old ones, so that the reference counts don't go to @@ -1884,6 +1880,10 @@ PostProcessEntry( } } + if (TkpConfigureMenuEntry(mePtr) != TCL_OK) { + return TCL_ERROR; + } + return TCL_OK; } |