From d6848d3bb1c83726881ab1d842a434e6f704302c Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Thu, 30 Aug 2012 21:53:01 +0100
Subject: [PATCH] Small AAX fix, and plugin file-chooser fix.

---
 modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp | 6 +++---
 modules/juce_gui_basics/native/juce_mac_FileChooser.mm    | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index 9c48ffbc66..ada08fd7b8 100644
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -336,11 +336,11 @@ struct AAXClasses
         class ContentWrapperComponent  : public juce::Component
         {
         public:
-            ContentWrapperComponent (JuceAAX_GUI& owner_, AudioProcessor* plugin)
-                : owner (owner_)
+            ContentWrapperComponent (JuceAAX_GUI& gui, AudioProcessor* plugin)
+                : owner (gui)
             {
                 setOpaque (true);
-                addAndMakeVisible (pluginEditor = plugin->createEditor());
+                addAndMakeVisible (pluginEditor = plugin->createEditorIfNeeded());
                 setBounds (pluginEditor->getLocalBounds());
             }
 
diff --git a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm
index 2d362e0388..372293d5ac 100644
--- a/modules/juce_gui_basics/native/juce_mac_FileChooser.mm
+++ b/modules/juce_gui_basics/native/juce_mac_FileChooser.mm
@@ -149,7 +149,9 @@ void FileChooser::showPlatformDialog (Array<File>& results,
 {
     JUCE_AUTORELEASEPOOL
 
-    const TemporaryMainMenuWithStandardCommands tempMenu;
+    ScopedPointer<TemporaryMainMenuWithStandardCommands> tempMenu;
+    if (JUCEApplication::isStandaloneApp())
+        tempMenu = new TemporaryMainMenuWithStandardCommands();
 
     StringArray* filters = new StringArray();
     filters->addTokens (filter.replaceCharacters (",:", ";;"), ";", String::empty);