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

Deletion of ModalComponentManager::Callback objects passed to native dialog boxes.

Browse source
This commit is contained in:
jules 2013-09-09 22:07:21 +01:00
parent ec524a437d
commit f1c01f1f3c
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_gui_basics/native/juce_android_Windowing.cpp
View file

@ -665,7 +665,10 @@ JUCE_JNI_CALLBACK (JUCE_ANDROID_ACTIVITY_CLASSNAME, alertDismissed, void, (JNIEn
jlong callbackAsLong, jint result))
{
if (ModalComponentManager::Callback* callback = (ModalComponentManager::Callback*) callbackAsLong)
{
callback->modalStateFinished (result);
delete callback;
}
}
//==============================================================================

2
modules/juce_gui_basics/native/juce_ios_Windowing.mm
View file

@ -154,7 +154,7 @@ private:
int result;
JuceAlertBoxDelegate* delegate;
UIAlertView* alert;
ModalComponentManager::Callback* callback;
ScopedPointer<ModalComponentManager::Callback> callback;
const bool isYesNo, isAsync;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (iOSMessageBox)

2
modules/juce_gui_basics/native/juce_mac_Windowing.mm
View file

@ -67,7 +67,7 @@ public:
private:
AlertWindow::AlertIconType iconType;
String title, message;
ModalComponentManager::Callback* callback;
ScopedPointer<ModalComponentManager::Callback> callback;
const char* button1;
const char* button2;
const char* button3;

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

@ -2931,14 +2931,12 @@ class WindowsMessageBox : public AsyncUpdater
{
public:
WindowsMessageBox (AlertWindow::AlertIconType iconType,
const String& title_, const String& message_,
Component* associatedComponent,
UINT extraFlags,
ModalComponentManager::Callback* callback_,
const bool runAsync)
const String& boxTitle, const String& m,
Component* associatedComponent, UINT extraFlags,
ModalComponentManager::Callback* cb, const bool runAsync)
: flags (extraFlags | getMessageBoxFlags (iconType)),
owner (getWindowForMessageBox (associatedComponent)),
title (title_), message (message_), callback (callback_)
title (boxTitle), message (m), callback (cb)
{
if (runAsync)
triggerAsyncUpdate();
@ -2964,7 +2962,7 @@ private:
UINT flags;
HWND owner;
String title, message;
ModalComponentManager::Callback* callback;
ScopedPointer<ModalComponentManager::Callback> callback;
static UINT getMessageBoxFlags (AlertWindow::AlertIconType iconType) noexcept
{