summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2009-04-10 16:16:04 (GMT)
committerdas <das>2009-04-10 16:16:04 (GMT)
commit9e44281f60a8fe47f0e9cd1ccd640848cfff54f1 (patch)
treeb7528dea764d925b7b3fdce4e8f80d7201617efb /generic
parent7eb9fdac1315b4665bef204fd257b30796f4349c (diff)
downloadtk-9e44281f60a8fe47f0e9cd1ccd640848cfff54f1.zip
tk-9e44281f60a8fe47f0e9cd1ccd640848cfff54f1.tar.gz
tk-9e44281f60a8fe47f0e9cd1ccd640848cfff54f1.tar.bz2
* generic/tkMenu.c (PostProcessEntry): delay call to
TkpConfigureMenuEntry() until all menu entry attributes are setup.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMenu.c10
1 files changed, 5 insertions, 5 deletions
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;
}