reuk
3 years ago
No known key found for this signature in database
GPG Key ID: 9ADCD339CFC98A11
1 changed files with 15 additions and 10 deletions
Unified View
Diff Options
+ 15
- 10
modules/juce_gui_basics/native/juce_mac_Windowing.mm
View File
| @@ -155,13 +155,14 @@ static int showDialog (const MessageBoxOptions& options, | |||||
| #if JUCE_MODAL_LOOPS_PERMITTED | #if JUCE_MODAL_LOOPS_PERMITTED | ||||
| void JUCE_CALLTYPE NativeMessageBox::showMessageBox (MessageBoxIconType iconType, | void JUCE_CALLTYPE NativeMessageBox::showMessageBox (MessageBoxIconType iconType, | ||||
| const String& title, const String& message, | const String& title, const String& message, | ||||
| Component* /*associatedComponent*/) | |||||
| Component* associatedComponent) | |||||
| { | { | ||||
| showDialog (MessageBoxOptions() | showDialog (MessageBoxOptions() | ||||
| .withIconType (iconType) | .withIconType (iconType) | ||||
| .withTitle (title) | .withTitle (title) | ||||
| .withMessage (message) | .withMessage (message) | ||||
| .withButton (TRANS("OK")), | |||||
| .withButton (TRANS("OK")) | |||||
| .withAssociatedComponent (associatedComponent), | |||||
| nullptr, AlertWindowMappings::messageBox); | nullptr, AlertWindowMappings::messageBox); | ||||
| } | } | ||||
| @@ -173,20 +174,21 @@ int JUCE_CALLTYPE NativeMessageBox::show (const MessageBoxOptions& options) | |||||
| void JUCE_CALLTYPE NativeMessageBox::showMessageBoxAsync (MessageBoxIconType iconType, | void JUCE_CALLTYPE NativeMessageBox::showMessageBoxAsync (MessageBoxIconType iconType, | ||||
| const String& title, const String& message, | const String& title, const String& message, | ||||
| Component* /*associatedComponent*/, | |||||
| Component* associatedComponent, | |||||
| ModalComponentManager::Callback* callback) | ModalComponentManager::Callback* callback) | ||||
| { | { | ||||
| showDialog (MessageBoxOptions() | showDialog (MessageBoxOptions() | ||||
| .withIconType (iconType) | .withIconType (iconType) | ||||
| .withTitle (title) | .withTitle (title) | ||||
| .withMessage (message) | .withMessage (message) | ||||
| .withButton (TRANS("OK")), | |||||
| .withButton (TRANS("OK")) | |||||
| .withAssociatedComponent (associatedComponent), | |||||
| callback, AlertWindowMappings::messageBox); | callback, AlertWindowMappings::messageBox); | ||||
| } | } | ||||
| bool JUCE_CALLTYPE NativeMessageBox::showOkCancelBox (MessageBoxIconType iconType, | bool JUCE_CALLTYPE NativeMessageBox::showOkCancelBox (MessageBoxIconType iconType, | ||||
| const String& title, const String& message, | const String& title, const String& message, | ||||
| Component* /*associatedComponent*/, | |||||
| Component* associatedComponent, | |||||
| ModalComponentManager::Callback* callback) | ModalComponentManager::Callback* callback) | ||||
| { | { | ||||
| return showDialog (MessageBoxOptions() | return showDialog (MessageBoxOptions() | ||||
| @@ -194,13 +196,14 @@ bool JUCE_CALLTYPE NativeMessageBox::showOkCancelBox (MessageBoxIconType iconTyp | |||||
| .withTitle (title) | .withTitle (title) | ||||
| .withMessage (message) | .withMessage (message) | ||||
| .withButton (TRANS("OK")) | .withButton (TRANS("OK")) | ||||
| .withButton (TRANS("Cancel")), | |||||
| .withButton (TRANS("Cancel")) | |||||
| .withAssociatedComponent (associatedComponent), | |||||
| callback, AlertWindowMappings::okCancel) != 0; | callback, AlertWindowMappings::okCancel) != 0; | ||||
| } | } | ||||
| int JUCE_CALLTYPE NativeMessageBox::showYesNoCancelBox (MessageBoxIconType iconType, | int JUCE_CALLTYPE NativeMessageBox::showYesNoCancelBox (MessageBoxIconType iconType, | ||||
| const String& title, const String& message, | const String& title, const String& message, | ||||
| Component* /*associatedComponent*/, | |||||
| Component* associatedComponent, | |||||
| ModalComponentManager::Callback* callback) | ModalComponentManager::Callback* callback) | ||||
| { | { | ||||
| return showDialog (MessageBoxOptions() | return showDialog (MessageBoxOptions() | ||||
| @@ -209,13 +212,14 @@ int JUCE_CALLTYPE NativeMessageBox::showYesNoCancelBox (MessageBoxIconType iconT | |||||
| .withMessage (message) | .withMessage (message) | ||||
| .withButton (TRANS("Yes")) | .withButton (TRANS("Yes")) | ||||
| .withButton (TRANS("No")) | .withButton (TRANS("No")) | ||||
| .withButton (TRANS("Cancel")), | |||||
| .withButton (TRANS("Cancel")) | |||||
| .withAssociatedComponent (associatedComponent), | |||||
| callback, AlertWindowMappings::yesNoCancel); | callback, AlertWindowMappings::yesNoCancel); | ||||
| } | } | ||||
| int JUCE_CALLTYPE NativeMessageBox::showYesNoBox (MessageBoxIconType iconType, | int JUCE_CALLTYPE NativeMessageBox::showYesNoBox (MessageBoxIconType iconType, | ||||
| const String& title, const String& message, | const String& title, const String& message, | ||||
| Component* /*associatedComponent*/, | |||||
| Component* associatedComponent, | |||||
| ModalComponentManager::Callback* callback) | ModalComponentManager::Callback* callback) | ||||
| { | { | ||||
| return showDialog (MessageBoxOptions() | return showDialog (MessageBoxOptions() | ||||
| @@ -223,7 +227,8 @@ int JUCE_CALLTYPE NativeMessageBox::showYesNoBox (MessageBoxIconType iconType, | |||||
| .withTitle (title) | .withTitle (title) | ||||
| .withMessage (message) | .withMessage (message) | ||||
| .withButton (TRANS("Yes")) | .withButton (TRANS("Yes")) | ||||
| .withButton (TRANS("No")), | |||||
| .withButton (TRANS("No")) | |||||
| .withAssociatedComponent (associatedComponent), | |||||
| callback, AlertWindowMappings::okCancel); | callback, AlertWindowMappings::okCancel); | ||||
| } | } | ||||