summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2005-01-09 00:26:59 (GMT)
committerchengyemao <chengyemao>2005-01-09 00:26:59 (GMT)
commit9781bdd89bf9ad394d087ce81543881c09ff0277 (patch)
tree366b0b586aa1412bbdf531ef80853e50c1b502ad /win
parent3d51fc76a503f6fbd5914a482da68aa6e5e7b933 (diff)
downloadtk-9781bdd89bf9ad394d087ce81543881c09ff0277.zip
tk-9781bdd89bf9ad394d087ce81543881c09ff0277.tar.gz
tk-9781bdd89bf9ad394d087ce81543881c09ff0277.tar.bz2
Bug fix in ReconfigureWindowsMenu. The bug caused a wrong geometry of a toplevel when created with a menu (bug# 1098625)
Diffstat (limited to 'win')
-rw-r--r--win/tkWinMenu.c10
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);