diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-12 07:40:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-12 07:40:15 (GMT) |
| commit | ce9c14ce313a1844f5adba5ea37f55786d3803da (patch) | |
| tree | a3d997c132979c8167ebedf84b3f5a99ea8febae /win/tkWinMenu.c | |
| parent | baa15df1bf04ebc2604a493c6cab48c845c865b4 (diff) | |
| parent | 589d0dde98f21d4046bf3fa2fb4112c90863b8ad (diff) | |
| download | tk-ce9c14ce313a1844f5adba5ea37f55786d3803da.zip tk-ce9c14ce313a1844f5adba5ea37f55786d3803da.tar.gz tk-ce9c14ce313a1844f5adba5ea37f55786d3803da.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 0b6efcf..c64bd9c 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -685,7 +685,7 @@ ReconfigureWindowsMenu( Tcl_DStringInit(&ds); Tcl_DStringAppend(&ds, - Tk_PathName(menuPtr->masterMenuPtr->tkwin), -1); + Tk_PathName(menuPtr->mainMenuPtr->tkwin), -1); Tcl_DStringAppend(&ds, ".system", 7); menuRefPtr = TkFindMenuReferences(menuPtr->interp, @@ -696,7 +696,7 @@ ReconfigureWindowsMenu( if ((menuRefPtr != NULL) && (menuRefPtr->menuPtr != NULL) && (menuPtr->parentTopLevelPtr != NULL) - && (systemMenuPtr->masterMenuPtr + && (systemMenuPtr->mainMenuPtr == menuRefPtr->menuPtr)) { HMENU systemMenuHdl = (HMENU) systemMenuPtr->platformData; HWND wrapper = TkWinGetWrapperWindow(menuPtr @@ -1689,7 +1689,7 @@ GetTearoffEntryGeometry( (void)mePtr; (void)tkfont; - if (menuPtr->menuType != MASTER_MENU) { + if (menuPtr->menuType != MAIN_MENU) { *heightPtr = 0; } else { *heightPtr = fmPtr->linespace; @@ -2597,7 +2597,7 @@ DrawTearoffEntry( (void)tkfont; (void)fmPtr; - if (menuPtr->menuType != MASTER_MENU) { + if (menuPtr->menuType != MAIN_MENU) { return; } @@ -3229,7 +3229,7 @@ TkpMenuNotifyToplevelCreate( if ((menuName != NULL) && (menuName[0] != '\0')) { menuRefPtr = TkFindMenuReferences(interp, menuName); if ((menuRefPtr != NULL) && (menuRefPtr->menuPtr != NULL)) { - for (menuPtr = menuRefPtr->menuPtr->masterMenuPtr; menuPtr != NULL; + for (menuPtr = menuRefPtr->menuPtr->mainMenuPtr; menuPtr != NULL; menuPtr = menuPtr->nextInstancePtr) { if (menuPtr->menuType == MENUBAR) { ScheduleMenuReconfigure(menuPtr); |