mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-02 03:20:06 +00:00
Code Activity

Windows: Fall back to old-style modal dialog when showing native message box modally since TaskDialog does not support fully modal dialogs

Browse source
This commit is contained in:
ed 2021-09-02 10:27:18 +01:00
parent b760620e05
commit baa1bbafdf
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -4621,33 +4621,31 @@ private:
static std::unique_ptr<WindowsMessageBoxBase> createMessageBox (const MessageBoxOptions& options,
std::unique_ptr<ModalComponentManager::Callback> callback)
{
std::unique_ptr<WindowsMessageBoxBase> messageBox;
const auto useTaskDialog =
#if JUCE_MODAL_LOOPS_PERMITTED
callback != nullptr &&
#endif
SystemStats::getOperatingSystemType() >= SystemStats::WinVista
&& WindowsTaskDialog::loadTaskDialog();
if (SystemStats::getOperatingSystemType() >= SystemStats::WinVista
&& WindowsTaskDialog::loadTaskDialog())
if (useTaskDialog)
return std::make_unique<WindowsTaskDialog> (options, std::move (callback));
const auto extraFlags = [&options]
{
messageBox.reset (new WindowsTaskDialog (options, std::move (callback)));
}
else
{
const auto extraFlags = [&options]
{
const auto numButtons = options.getNumButtons();
const auto numButtons = options.getNumButtons();
if (numButtons == 3)
return MB_YESNOCANCEL;
if (numButtons == 3)
return MB_YESNOCANCEL;
if (numButtons == 2)
return options.getButtonText (0) == "OK" ? MB_OKCANCEL
: MB_YESNO;
if (numButtons == 2)
return options.getButtonText (0) == "OK" ? MB_OKCANCEL
: MB_YESNO;
return MB_OK;
}();
return MB_OK;
}();
messageBox.reset (new PreVistaMessageBox (options, (UINT) extraFlags, std::move (callback)));
}
return messageBox;
return std::make_unique<PreVistaMessageBox> (options, (UINT) extraFlags, std::move (callback));
}
static int showDialog (const MessageBoxOptions& options,