diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index cbfea59145..2876f0d997 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -1100,7 +1100,8 @@ public: { const bool wasValid = isValid(); - wrapper.setVisible (false); + // NB: making the wrapper invisible before removing it causes + // strange internal crashes in some Apple AUs. removeChildComponent (&wrapper); wrapper.setView (nil); diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp index 65435e6e6d..6b4de7454f 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp @@ -107,11 +107,10 @@ void DocumentWindow::setTitleBarHeight (const int newHeight) repaintTitleBar(); } -void DocumentWindow::setTitleBarButtonsRequired (const int requiredButtons_, - const bool positionTitleBarButtonsOnLeft_) +void DocumentWindow::setTitleBarButtonsRequired (const int buttons, const bool onLeft) { - requiredButtons = requiredButtons_; - positionTitleBarButtonsOnLeft = positionTitleBarButtonsOnLeft_; + requiredButtons = buttons; + positionTitleBarButtonsOnLeft = onLeft; lookAndFeelChanged(); } diff --git a/modules/juce_gui_basics/windows/juce_DocumentWindow.h b/modules/juce_gui_basics/windows/juce_DocumentWindow.h index 4ea516f737..5dde7cb901 100644 --- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h +++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h @@ -205,13 +205,13 @@ public: virtual void maximiseButtonPressed(); //============================================================================== - /** Returns the close button, (or 0 if there isn't one). */ + /** Returns the close button, (or nullptr if there isn't one). */ Button* getCloseButton() const noexcept; - /** Returns the minimise button, (or 0 if there isn't one). */ + /** Returns the minimise button, (or nullptr if there isn't one). */ Button* getMinimiseButton() const noexcept; - /** Returns the maximise button, (or 0 if there isn't one). */ + /** Returns the maximise button, (or nullptr if there isn't one). */ Button* getMaximiseButton() const noexcept; //============================================================================== @@ -231,7 +231,7 @@ public: //============================================================================== #ifndef DOXYGEN /** @internal */ - void paint (Graphics& g); + void paint (Graphics&); /** @internal */ void resized(); /** @internal */ @@ -241,7 +241,7 @@ public: /** @internal */ BorderSize getContentComponentBorder(); /** @internal */ - void mouseDoubleClick (const MouseEvent& e); + void mouseDoubleClick (const MouseEvent&); /** @internal */ void userTriedToCloseWindow(); /** @internal */ diff --git a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm index 8306617321..99feddee99 100644 --- a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm +++ b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm @@ -27,13 +27,13 @@ class NSViewAttachment : public ReferenceCountedObject, public ComponentMovementWatcher { public: - NSViewAttachment (NSView* const view_, Component& owner_) - : ComponentMovementWatcher (&owner_), - view (view_), - owner (owner_), + NSViewAttachment (NSView* const v, Component& comp) + : ComponentMovementWatcher (&comp), + view (v), + owner (comp), currentPeer (nullptr) { - [view_ retain]; + [view retain]; if (owner.isShowing()) componentPeerChanged();