diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-26 10:44:04 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-26 10:44:04 (GMT) |
commit | ae8836e95248ef2e25508b3e234ae1f1ef46efac (patch) | |
tree | e7197c37fb5c60b4f815d39faa930fb11563fb5f /macosx/tkMacOSXMenu.c | |
parent | a33411438ab9001bdd38f2d693229ec03b565c79 (diff) | |
parent | 219216c26fe5f38d29a865b7df2a5f816d20fffa (diff) | |
download | tk-ae8836e95248ef2e25508b3e234ae1f1ef46efac.zip tk-ae8836e95248ef2e25508b3e234ae1f1ef46efac.tar.gz tk-ae8836e95248ef2e25508b3e234ae1f1ef46efac.tar.bz2 |
Fix [08eb057dea]: Aqua: cleanup Carbon-era cursor variables.
Do more cleanup: No browser still supports NSAPI, so functions like Tk_MacOSXSetEmbedHandler() don't make any sense any more
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
-rw-r--r-- | macosx/tkMacOSXMenu.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 8c8ec99..598793d 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -91,9 +91,6 @@ static const struct { #undef ACCEL #undef sl -static int gNoTkMenus = 0; /* This is used by Tk_MacOSXTurnOffMenus as - * the flag that Tk is not to draw any - * menus. */ static int inPostMenu = 0; static SInt32 menuMarkColumnWidth = 0, menuIconTrailingEdgeMargin = 0; static SInt32 menuTextLeadingEdgeMargin = 0, menuTextTrailingEdgeMargin = 0; @@ -493,10 +490,6 @@ TKBackgroundLoop *backgroundLoop = nil; - (void) tkSetMainMenu: (TKMenu *) menu { - if (gNoTkMenus) { - return; - } - TKMenu *applicationMenu = nil; if (menu) { @@ -1665,30 +1658,6 @@ TkMacOSXClearMenubarActive(void) /* *---------------------------------------------------------------------- * - * Tk_MacOSXTurnOffMenus -- - * - * Turns off all the menu drawing code. This is more than just disabling - * the "menu" command, this means that Tk will NEVER touch the menubar. - * It is needed in the Plugin, where Tk does not own the menubar. - * - * Results: - * None. - * - * Side effects: - * A flag is set which will disable all menu drawing. - * - *---------------------------------------------------------------------- - */ - -void -Tk_MacOSXTurnOffMenus(void) -{ - gNoTkMenus = 1; -} - -/* - *---------------------------------------------------------------------- - * * TkpMenuInit -- * * Initializes Mac-specific menu data. |