| @@ -104,16 +104,16 @@ public: | |||||
| utf8Window = nullptr; | utf8Window = nullptr; | ||||
| svgPathWindow = nullptr; | svgPathWindow = nullptr; | ||||
| #if JUCE_MAC | |||||
| MenuBarModel::setMacMainMenu (nullptr); | |||||
| #endif | |||||
| menuModel = nullptr; | |||||
| mainWindowList.forceCloseAllWindows(); | mainWindowList.forceCloseAllWindows(); | ||||
| openDocumentManager.clear(); | openDocumentManager.clear(); | ||||
| commandManager = nullptr; | commandManager = nullptr; | ||||
| settings = nullptr; | settings = nullptr; | ||||
| #if JUCE_MAC | |||||
| MenuBarModel::setMacMainMenu (nullptr); | |||||
| #endif | |||||
| menuModel = nullptr; | |||||
| LookAndFeel::setDefaultLookAndFeel (nullptr); | LookAndFeel::setDefaultLookAndFeel (nullptr); | ||||
| if (! isRunningCommandLine) | if (! isRunningCommandLine) | ||||
| @@ -173,19 +173,19 @@ public: | |||||
| setApplicationCommandManagerToWatch (&getCommandManager()); | setApplicationCommandManagerToWatch (&getCommandManager()); | ||||
| } | } | ||||
| StringArray getMenuBarNames() | |||||
| StringArray getMenuBarNames() override | |||||
| { | { | ||||
| return getApp().getMenuNames(); | return getApp().getMenuNames(); | ||||
| } | } | ||||
| PopupMenu getMenuForIndex (int /*topLevelMenuIndex*/, const String& menuName) | |||||
| PopupMenu getMenuForIndex (int /*topLevelMenuIndex*/, const String& menuName) override | |||||
| { | { | ||||
| PopupMenu menu; | PopupMenu menu; | ||||
| getApp().createMenu (menu, menuName); | getApp().createMenu (menu, menuName); | ||||
| return menu; | return menu; | ||||
| } | } | ||||
| void menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/) | |||||
| void menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/) override | |||||
| { | { | ||||
| getApp().handleMainMenuCommand (menuItemID); | getApp().handleMainMenuCommand (menuItemID); | ||||
| } | } | ||||