mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-18 00:54:19 +00:00
Code Activity

fixed a problem with native submenus in Snow Leopard

Browse source
This commit is contained in:
Julian Storer 2009-08-31 17:08:52 +01:00
parent ddf22bd416
commit a983bb1300
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
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
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;