From db5ab181a8cdf05a8af905bf544707b594dc74f2 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 13 Jan 2009 10:55:49 +0000 Subject: [PATCH] Small fix to StandaloneFilterWindow --- .../wrapper/Standalone/juce_StandaloneFilterWindow.cpp | 2 +- juce_amalgamated.cpp | 7 ++++++- juce_amalgamated.h | 2 ++ .../gui/components/lookandfeel/juce_LookAndFeel.cpp | 2 +- .../gui/components/windows/juce_AlertWindow.cpp | 5 +++++ .../gui/components/windows/juce_AlertWindow.h | 2 ++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp b/extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp index e605d546d6..8740f3ec35 100644 --- a/extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp +++ b/extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp @@ -243,7 +243,7 @@ void StandaloneFilterWindow::showAudioSettingsDialog() filter->getNumInputChannels(), filter->getNumOutputChannels(), filter->getNumOutputChannels(), - true, false, true); + true, false, true, false); selectorComp.setSize (500, 450); diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 9ed2ed1266..542f3bc5d9 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -60270,7 +60270,7 @@ const Path LookAndFeel::getCrossShape (const float height) return p; } -void LookAndFeel::drawTreeviewPlusMinusBox (Graphics& g, int x, int y, int w, int h, bool isPlus, bool isMouseOver) +void LookAndFeel::drawTreeviewPlusMinusBox (Graphics& g, int x, int y, int w, int h, bool isPlus, bool /*isMouseOver*/) { const int boxSize = ((jmin (16, w, h) << 1) / 3) | 1; @@ -70897,6 +70897,11 @@ AlertWindow::~AlertWindow() deleteAllChildren(); } +void AlertWindow::userTriedToCloseWindow() +{ + exitModalState (0); +} + void AlertWindow::setMessage (const String& message) { const String newMessage (message.substring (0, 2048)); diff --git a/juce_amalgamated.h b/juce_amalgamated.h index bd2ac23ad6..a02780e235 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -50574,6 +50574,8 @@ protected: void buttonClicked (Button* button); /** @internal */ void lookAndFeelChanged(); + /** @internal */ + void userTriedToCloseWindow(); private: String text; diff --git a/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp b/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp index a06b83fb9c..0873e16fb5 100644 --- a/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp +++ b/src/juce_appframework/gui/components/lookandfeel/juce_LookAndFeel.cpp @@ -836,7 +836,7 @@ const Path LookAndFeel::getCrossShape (const float height) } //============================================================================== -void LookAndFeel::drawTreeviewPlusMinusBox (Graphics& g, int x, int y, int w, int h, bool isPlus, bool isMouseOver) +void LookAndFeel::drawTreeviewPlusMinusBox (Graphics& g, int x, int y, int w, int h, bool isPlus, bool /*isMouseOver*/) { const int boxSize = ((jmin (16, w, h) << 1) / 3) | 1; diff --git a/src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp b/src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp index b994d8c90c..25dcae39fb 100644 --- a/src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp +++ b/src/juce_appframework/gui/components/windows/juce_AlertWindow.cpp @@ -127,6 +127,11 @@ AlertWindow::~AlertWindow() deleteAllChildren(); } +void AlertWindow::userTriedToCloseWindow() +{ + exitModalState (0); +} + //============================================================================== void AlertWindow::setMessage (const String& message) { diff --git a/src/juce_appframework/gui/components/windows/juce_AlertWindow.h b/src/juce_appframework/gui/components/windows/juce_AlertWindow.h index 96a004ab05..2c04c1da4d 100644 --- a/src/juce_appframework/gui/components/windows/juce_AlertWindow.h +++ b/src/juce_appframework/gui/components/windows/juce_AlertWindow.h @@ -337,6 +337,8 @@ protected: void buttonClicked (Button* button); /** @internal */ void lookAndFeelChanged(); + /** @internal */ + void userTriedToCloseWindow(); private: String text;