From bdabe51b63a890fa4c90e4a287157cdcca44be33 Mon Sep 17 00:00:00 2001 From: das Date: Fri, 10 Apr 2009 16:16:04 +0000 Subject: * generic/tkMenu.c (PostProcessEntry): delay call to TkpConfigureMenuEntry() until all menu entry attributes are setup. --- ChangeLog | 3 +++ generic/tkMenu.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8121365..d912394 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-04-10 Daniel Steffen + * 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 acb6ac9..2db5e70 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.41.2.1 2009/02/06 08:13:23 das Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.41.2.2 2009/04/10 16:16:04 das Exp $ */ /* @@ -1782,10 +1782,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 @@ -1882,6 +1878,10 @@ PostProcessEntry( } } + if (TkpConfigureMenuEntry(mePtr) != TCL_OK) { + return TCL_ERROR; + } + return TCL_OK; } -- cgit v0.12