jules
10 years ago
2 changed files with 7 additions and 8 deletions
Unified View
Diff Options
-
+4 -4modules/juce_events/native/juce_mac_MessageManager.mm
-
+3 -4modules/juce_gui_basics/components/juce_Component.cpp
+ 4
- 4
modules/juce_events/native/juce_mac_MessageManager.mm
View File
| @@ -53,7 +53,7 @@ public: | |||||
| [[NSDistributedNotificationCenter defaultCenter] addObserver: delegate | [[NSDistributedNotificationCenter defaultCenter] addObserver: delegate | ||||
| selector: @selector (broadcastMessageCallback:) | selector: @selector (broadcastMessageCallback:) | ||||
| name: getBroacastEventName() | |||||
| name: getBroadcastEventName() | |||||
| object: nil]; | object: nil]; | ||||
| } | } | ||||
| else | else | ||||
| @@ -79,14 +79,14 @@ public: | |||||
| [NSApp setDelegate: nil]; | [NSApp setDelegate: nil]; | ||||
| [[NSDistributedNotificationCenter defaultCenter] removeObserver: delegate | [[NSDistributedNotificationCenter defaultCenter] removeObserver: delegate | ||||
| name: getBroacastEventName() | |||||
| name: getBroadcastEventName() | |||||
| object: nil]; | object: nil]; | ||||
| } | } | ||||
| [delegate release]; | [delegate release]; | ||||
| } | } | ||||
| static NSString* getBroacastEventName() | |||||
| static NSString* getBroadcastEventName() | |||||
| { | { | ||||
| return juceStringToNS ("juce_" + String::toHexString (File::getSpecialLocation (File::currentExecutableFile).hashCode64())); | return juceStringToNS ("juce_" + String::toHexString (File::getSpecialLocation (File::currentExecutableFile).hashCode64())); | ||||
| } | } | ||||
| @@ -356,7 +356,7 @@ void MessageManager::broadcastMessage (const String& message) | |||||
| NSDictionary* info = [NSDictionary dictionaryWithObject: juceStringToNS (message) | NSDictionary* info = [NSDictionary dictionaryWithObject: juceStringToNS (message) | ||||
| forKey: nsStringLiteral ("message")]; | forKey: nsStringLiteral ("message")]; | ||||
| [[NSDistributedNotificationCenter defaultCenter] postNotificationName: AppDelegate::getBroacastEventName() | |||||
| [[NSDistributedNotificationCenter defaultCenter] postNotificationName: AppDelegate::getBroadcastEventName() | |||||
| object: nil | object: nil | ||||
| userInfo: info]; | userInfo: info]; | ||||
| } | } | ||||
+ 3
- 4
modules/juce_gui_basics/components/juce_Component.cpp
View File
| @@ -2309,16 +2309,15 @@ void Component::internalModalInputAttempt() | |||||
| //============================================================================== | //============================================================================== | ||||
| void Component::postCommandMessage (const int commandId) | void Component::postCommandMessage (const int commandId) | ||||
| { | { | ||||
| class CustomCommandMessage : public CallbackMessage | |||||
| struct CustomCommandMessage : public CallbackMessage | |||||
| { | { | ||||
| public: | |||||
| CustomCommandMessage (Component* const c, const int command) | CustomCommandMessage (Component* const c, const int command) | ||||
| : target (c), commandId (command) {} | : target (c), commandId (command) {} | ||||
| void messageCallback() override | void messageCallback() override | ||||
| { | { | ||||
| if (target.get() != nullptr) // (get() required for VS2003 bug) | |||||
| target->handleCommandMessage (commandId); | |||||
| if (Component* c = target.get()) | |||||
| c->handleCommandMessage (commandId); | |||||
| } | } | ||||
| private: | private: | ||||