diff options
| author | hobbs <hobbs> | 2007-10-15 20:52:46 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2007-10-15 20:52:46 (GMT) |
| commit | adaeb1b2d2e9f439ab072349dedd7bd0f414394d (patch) | |
| tree | 0b6519680e9c83fec3e54dacfb130e98d65f0296 /macosx/tkMacOSXMenubutton.c | |
| parent | 410da9d556a7306f0b2bea77db33c15a7375c315 (diff) | |
| download | tk-adaeb1b2d2e9f439ab072349dedd7bd0f414394d.zip tk-adaeb1b2d2e9f439ab072349dedd7bd0f414394d.tar.gz tk-adaeb1b2d2e9f439ab072349dedd7bd0f414394d.tar.bz2 | |
* generic/tkFocus.c, generic/tkFrame.c, generic/tkInt.h:
* macosx/tkMacOSXButton.c, macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXWm.c, unix/tkUnixWm.c, win/tkWinWm.c:
* doc/wm.n, tests/wm.test: TIP #125 implementation [Bug 998125]
Adds [wm manage|forget] for dockable frames.
Finished X11 and Windows code, needs OS X completion.
Diffstat (limited to 'macosx/tkMacOSXMenubutton.c')
| -rw-r--r-- | macosx/tkMacOSXMenubutton.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c index beb8e71..fb18b2e 100644 --- a/macosx/tkMacOSXMenubutton.c +++ b/macosx/tkMacOSXMenubutton.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.15 2007/06/29 03:20:02 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.16 2007/10/15 20:52:47 hobbs Exp $ */ #include "tkMacOSXPrivate.h" @@ -193,8 +193,12 @@ TkpDisplayMenuButton( if (mbPtr->userPane) { MenuButtonControlParams params; bzero(¶ms, sizeof(params)); - ComputeMenuButtonControlParams(butPtr, ¶ms ); - if (bcmp(¶ms,&mbPtr->params,sizeof(params))) { + ComputeMenuButtonControlParams(butPtr, ¶ms); + if ( +#ifdef TK_REBUILD_TOPLEVEL + (winPtr->flags & TK_REBUILD_TOPLEVEL) || +#endif + bcmp(¶ms,&mbPtr->params,sizeof(params))) { if (mbPtr->userPane) { DisposeControl(mbPtr->userPane); mbPtr->userPane = NULL; |