mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

AlertWindow: Fix result codes when displaying native dialogs through the AlertWindow APIs

Browse source
This commit is contained in:
reuk 2023-04-04 17:26:29 +01:00
parent 9d50ab6c59
commit ad094cd883
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_basics/juce_gui_basics.cpp
View file

@ -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"

12
modules/juce_gui_basics/windows/juce_AlertWindow.cpp
View file

@ -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);
}