summaryrefslogtreecommitdiffstats
path: root/generic/tkMenu.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-09-16 20:06:33 (GMT)
committerhobbs <hobbs>2004-09-16 20:06:33 (GMT)
commit713eef221ba8d003700472ff66bce12742b29595 (patch)
treeaebabf7afcea07eb00d4ff2f9561fd54b910f723 /generic/tkMenu.c
parent3d047ef34c8fe79f75163ee7af094a65ca966e35 (diff)
downloadtk-713eef221ba8d003700472ff66bce12742b29595.zip
tk-713eef221ba8d003700472ff66bce12742b29595.tar.gz
tk-713eef221ba8d003700472ff66bce12742b29595.tar.bz2
* generic/tkMenu.c (MenuWorldChanged): ensure that we recompute
the menu geometry on WorldChanged to handle font size changes. [Bug 607649]
Diffstat (limited to 'generic/tkMenu.c')
-rw-r--r--generic/tkMenu.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index a87eaf3..e3859a9 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.25 2004/01/13 02:06:00 davygrvy Exp $
+ * RCS: @(#) $Id: tkMenu.c,v 1.26 2004/09/16 20:06:33 hobbs Exp $
*/
/*
@@ -1384,7 +1384,7 @@ UnhookCascadeEntry(mePtr)
* Singularly linked list deletion. The two special cases are
* 1. one element; 2. The first element is the one we want.
*/
-
+
if (cascadeEntryPtr == mePtr) {
if (cascadeEntryPtr->nextCascadePtr == NULL) {
@@ -1393,7 +1393,7 @@ UnhookCascadeEntry(mePtr)
* menu, so we need to clear out the list pointer in the
* cascade itself.
*/
-
+
menuRefPtr->parentEntryPtr = NULL;
/*
* The original field is set to zero below, after it is
@@ -1448,7 +1448,6 @@ DestroyMenuEntry(memPtr)
TkMenu *menuPtr = mePtr->menuPtr;
if (menuPtr->postedCascade == mePtr) {
-
/*
* Ignore errors while unposting the menu, since it's possible
* that the menu has already been deleted and the unpost will
@@ -1537,20 +1536,21 @@ DestroyMenuEntry(memPtr)
*
*---------------------------------------------------------------------------
*/
-
+
static void
MenuWorldChanged(instanceData)
ClientData instanceData; /* Information about widget. */
{
TkMenu *menuPtr = (TkMenu *) instanceData;
int i;
-
+
TkMenuConfigureDrawOptions(menuPtr);
for (i = 0; i < menuPtr->numEntries; i++) {
TkMenuConfigureEntryDrawOptions(menuPtr->entries[i],
menuPtr->entries[i]->index);
- TkpConfigureMenuEntry(menuPtr->entries[i]);
+ TkpConfigureMenuEntry(menuPtr->entries[i]);
}
+ TkEventuallyRecomputeMenu(menuPtr);
}
/*