diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-11 14:34:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-11 14:34:08 (GMT) |
| commit | b9ec863e51c38596a4d72a0b58c339da5722a60f (patch) | |
| tree | 55d84ddd9cb9c82dec8a258d51a4e0812f91a51f /generic/tkMenu.c | |
| parent | 2d53ba3adf291bb756a9e0d2232aa905583dbe11 (diff) | |
| parent | d04037e2ec5c24ef18b159dc174f9c3d6b73a0f7 (diff) | |
| download | tk-b9ec863e51c38596a4d72a0b58c339da5722a60f.zip tk-b9ec863e51c38596a4d72a0b58c339da5722a60f.tar.gz tk-b9ec863e51c38596a4d72a0b58c339da5722a60f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index d5a6b55..dfe436c 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -580,14 +580,14 @@ Tk_MenuObjCmd( while (topLevelListPtr != NULL) { /* - * Need to get the next pointer first. TkSetWindowMenuBar changes + * Need to get the next pointer first. Tk_SetWindowMenuBar changes * the list, so that the next pointer is different after calling * it. */ nextPtr = topLevelListPtr->nextPtr; listtkwin = topLevelListPtr->tkwin; - TkSetWindowMenuBar(menuPtr->interp, listtkwin, + Tk_SetWindowMenuBar(menuPtr->interp, listtkwin, Tk_PathName(menuPtr->tkwin), Tk_PathName(menuPtr->tkwin)); topLevelListPtr = nextPtr; } @@ -3140,7 +3140,7 @@ TkNewMenuName( /* *---------------------------------------------------------------------- * - * TkSetWindowMenuBar -- + * Tk_SetWindowMenuBar -- * * Associates a menu with a window. Called by ConfigureFrame in in * response to a "-menu .foo" configuration option for a top level. @@ -3156,7 +3156,7 @@ TkNewMenuName( */ void -TkSetWindowMenuBar( +Tk_SetWindowMenuBar( Tcl_Interp *interp, /* The interpreter the toplevel lives in. */ Tk_Window tkwin, /* The toplevel window. */ const char *oldMenuName, /* The name of the menubar previously set in @@ -3298,7 +3298,7 @@ TkSetWindowMenuBar( } else { TkpSetWindowMenuBar(tkwin, NULL); } - TkpSetMainMenubar(interp, tkwin, menuName); + Tk_SetMainMenubar(interp, tkwin, menuName); } /* |