diff options
| author | chengyemao <chengyemao@noemail.net> | 2005-01-09 00:26:58 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao@noemail.net> | 2005-01-09 00:26:58 (GMT) |
| commit | 97023e7bca3dc4c9e724c0d73a66906a358c8870 (patch) | |
| tree | 366b0b586aa1412bbdf531ef80853e50c1b502ad | |
| parent | 0910f879887a76e9193d9da614d13fca71724a17 (diff) | |
| download | tk-97023e7bca3dc4c9e724c0d73a66906a358c8870.zip tk-97023e7bca3dc4c9e724c0d73a66906a358c8870.tar.gz tk-97023e7bca3dc4c9e724c0d73a66906a358c8870.tar.bz2 | |
Bug fix in ReconfigureWindowsMenu. The bug caused a wrong geometry of a toplevel when created with a menu (bug# 1098625)
FossilOrigin-Name: 14d46ad1ea8104d689670f32f05f4d72588938a9
| -rw-r--r-- | win/tkWinMenu.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 6babc9b..425e8e9 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.38 2005/01/04 02:09:45 chengyemao Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.39 2005/01/09 00:26:59 chengyemao Exp $ */ #define OEMRESOURCE @@ -538,7 +538,6 @@ ReconfigureWindowsMenu( UINT flags; UINT itemID; int i, count, systemMenu = 0, base; - int width, height; Tcl_DString translatedText; if (NULL == winMenuHdl) { @@ -551,12 +550,6 @@ ReconfigureWindowsMenu( * */ - if ((menuPtr->menuType == MENUBAR) - && (menuPtr->parentTopLevelPtr != NULL)) { - width = Tk_Width(menuPtr->parentTopLevelPtr); - height = Tk_Height(menuPtr->parentTopLevelPtr); - } - base = (menuPtr->menuFlags & MENU_SYSTEM_MENU) ? 7 : 0; count = GetMenuItemCount(winMenuHdl); for (i = base; i < count; i++) { @@ -708,7 +701,6 @@ ReconfigureWindowsMenu( if (bar) { DrawMenuBar(bar); } - Tk_GeometryRequest(menuPtr->parentTopLevelPtr, width, height); } menuPtr->menuFlags &= ~(MENU_RECONFIGURE_PENDING); |