Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using return code properly even when using CFUserNotification in non-gui thread, rearranging [alert release] so that callback does not get a zombie as a parameter

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-07 13:55:09 +02:00
parent 4312de64c7
commit e61922b4c7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/msgdlg.mm
View File

@@ -71,8 +71,6 @@ int wxMessageDialog::ShowModal()
wxCFEventLoopPauseIdleEvents pause; wxCFEventLoopPauseIdleEvents pause;
int resultbutton = wxID_CANCEL;
const long style = GetMessageDialogStyle(); const long style = GetMessageDialogStyle();
wxASSERT_MSG( (style & 0x3F) != wxYES, wxT("this style is not supported on Mac") ); wxASSERT_MSG( (style & 0x3F) != wxYES, wxT("this style is not supported on Mac") );
@@ -156,7 +154,9 @@ int wxMessageDialog::ShowModal()
0, alertType, NULL, NULL, NULL, cfTitle, cfText, 0, alertType, NULL, NULL, NULL, cfTitle, cfText,
defaultButtonTitle, alternateButtonTitle, otherButtonTitle, &exitButton ); defaultButtonTitle, alternateButtonTitle, otherButtonTitle, &exitButton );
if (err == noErr) if (err == noErr)
resultbutton = m_buttonId[exitButton]; SetReturnCode( m_buttonId[exitButton] );
else
SetReturnCode( wxID_CANCEL );
} }
else else
{ {
@@ -164,8 +164,8 @@ int wxMessageDialog::ShowModal()
int button = -1; int button = -1;
button = [alert runModal]; button = [alert runModal];
[alert release];
ModalFinishedCallback(alert, button); ModalFinishedCallback(alert, button);
[alert release];
} }
return GetReturnCode(); return GetReturnCode();