diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-13 11:07:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-13 11:07:44 (GMT) |
| commit | f8e123a7ce6504a4682cc507edae2eb8b696621f (patch) | |
| tree | c52c7c579a8675b92985d44aa7daf5695c02f106 /unix | |
| parent | 4658a19f9128ef93ebd4e5052547f4cf2176516e (diff) | |
| parent | 873edb3321e09048e82e52ad58e133216bd2a10b (diff) | |
| download | tk-f8e123a7ce6504a4682cc507edae2eb8b696621f.zip tk-f8e123a7ce6504a4682cc507edae2eb8b696621f.tar.gz tk-f8e123a7ce6504a4682cc507edae2eb8b696621f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixMenu.c | 16 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index cf864c0..7824470 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -1084,7 +1084,7 @@ GetTearoffEntryGeometry( { (void)mePtr; - if (menuPtr->menuType != MASTER_MENU) { + if (menuPtr->menuType != MAIN_MENU) { *heightPtr = 0; *widthPtr = 0; } else { @@ -1312,7 +1312,7 @@ DrawTearoffEntry( (void)tkfont; (void)fmPtr; - if (menuPtr->menuType != MASTER_MENU) { + if (menuPtr->menuType != MAIN_MENU) { return; } @@ -1407,16 +1407,16 @@ SetHelpMenu( cascadeEntryPtr != NULL; cascadeEntryPtr = cascadeEntryPtr->nextCascadePtr) { if ((cascadeEntryPtr->menuPtr->menuType == MENUBAR) - && (cascadeEntryPtr->menuPtr->masterMenuPtr->tkwin != NULL) - && (menuPtr->masterMenuPtr->tkwin != NULL)) { - TkMenu *masterMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr; + && (cascadeEntryPtr->menuPtr->mainMenuPtr->tkwin != NULL) + && (menuPtr->mainMenuPtr->tkwin != NULL)) { + TkMenu *mainMenuPtr = cascadeEntryPtr->menuPtr->mainMenuPtr; char *helpMenuName = (char *)ckalloc(strlen(Tk_PathName( - masterMenuPtr->tkwin)) + strlen(".help") + 1); + mainMenuPtr->tkwin)) + strlen(".help") + 1); - strcpy(helpMenuName, Tk_PathName(masterMenuPtr->tkwin)); + strcpy(helpMenuName, Tk_PathName(mainMenuPtr->tkwin)); strcat(helpMenuName, ".help"); if (strcmp(helpMenuName, - Tk_PathName(menuPtr->masterMenuPtr->tkwin)) == 0) { + Tk_PathName(menuPtr->mainMenuPtr->tkwin)) == 0) { cascadeEntryPtr->entryFlags |= ENTRY_HELP_MENU; } else { cascadeEntryPtr->entryFlags &= ~ENTRY_HELP_MENU; diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index a72c0fe..da38710 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -149,7 +149,7 @@ #define TkpButtonSetDefaults() {} #define TkpDestroyButton(butPtr) {} -#define TkpWillDrawWidget(tkwin) 1 +#define TkpWillDrawWidget(tkwin) 0 #define TkpRedrawWidget(tkwin) #define TkSelUpdateClipboard(a,b) {} #ifndef __CYGWIN__ |