Browse Source

fixed a problem with native submenus in Snow Leopard

tags/2021-05-28
Julian Storer 16 years ago
parent
commit
a983bb1300
2 changed files with 6 additions and 0 deletions
  1. +3
    -0
      juce_amalgamated.cpp
  2. +3
    -0
      src/native/mac/juce_mac_MainMenu.mm

+ 3
- 0
juce_amalgamated.cpp View File

@@ -259191,6 +259191,7 @@ public:
[item setEnabled: iter.isEnabled];

NSMenu* sub = createMenu (*iter.subMenu, iter.itemName, topLevelMenuId, topLevelIndex);
[sub setDelegate: nil];
[menuToAddTo setSubmenu: sub forItem: item];
}
else
@@ -259397,6 +259398,8 @@ void MenuBarModel::setMacMainMenu (MenuBarModel* newMenuBarModel,
{
if (getMacMainMenu() != newMenuBarModel)
{
const ScopedAutoReleasePool pool;

if (newMenuBarModel == 0)
{
delete JuceMainMenuHandler::instance;


+ 3
- 0
src/native/mac/juce_mac_MainMenu.mm View File

@@ -258,6 +258,7 @@ public:
[item setEnabled: iter.isEnabled];
NSMenu* sub = createMenu (*iter.subMenu, iter.itemName, topLevelMenuId, topLevelIndex);
[sub setDelegate: nil];
[menuToAddTo setSubmenu: sub forItem: item];
}
else
@@ -465,6 +466,8 @@ void MenuBarModel::setMacMainMenu (MenuBarModel* newMenuBarModel,
{
if (getMacMainMenu() != newMenuBarModel)
{
const ScopedAutoReleasePool pool;
if (newMenuBarModel == 0)
{
delete JuceMainMenuHandler::instance;


Loading…
Cancel
Save