diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 14361d674e..e053d102ef 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -331,13 +331,13 @@ #include "widgets/juce_ToolbarItemComponent.cpp" #include "widgets/juce_ToolbarItemPalette.cpp" #include "widgets/juce_TreeView.cpp" +#include "windows/juce_NativeMessageBox.cpp" #include "windows/juce_AlertWindow.cpp" #include "windows/juce_CallOutBox.cpp" #include "windows/juce_ComponentPeer.cpp" #include "windows/juce_DialogWindow.cpp" #include "windows/juce_DocumentWindow.cpp" #include "windows/juce_MessageBoxOptions.cpp" -#include "windows/juce_NativeMessageBox.cpp" #include "windows/juce_ResizableWindow.cpp" #include "windows/juce_ScopedMessageBox.cpp" #include "windows/juce_ThreadWithProgressWindow.cpp" diff --git a/modules/juce_gui_basics/windows/juce_AlertWindow.cpp b/modules/juce_gui_basics/windows/juce_AlertWindow.cpp index 305758e8bd..380ce4125b 100644 --- a/modules/juce_gui_basics/windows/juce_AlertWindow.cpp +++ b/modules/juce_gui_basics/windows/juce_AlertWindow.cpp @@ -645,17 +645,7 @@ static int showMaybeAsync (const MessageBoxOptions& options, ModalComponentManager::Callback* callbackIn) { if (LookAndFeel::getDefaultLookAndFeel().isUsingNativeAlertWindows()) - { - #if JUCE_MODAL_LOOPS_PERMITTED - if (callbackIn == nullptr) - return NativeMessageBox::show (options); - #endif - -JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations") - NativeMessageBox::showAsync (options, callbackIn); -JUCE_END_IGNORE_WARNINGS_GCC_LIKE - return false; - } + return showNativeBoxUnmanaged (options, callbackIn, ResultCodeMappingMode::alertWindow); return showAlertWindowUnmanaged (options, callbackIn); }