X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c2dc57d58994766ac9a6509043bb0ed578916cf..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/iphone/msgdlg.mm diff --git a/src/osx/iphone/msgdlg.mm b/src/osx/iphone/msgdlg.mm index 4567f105b0..bb43a66243 100644 --- a/src/osx/iphone/msgdlg.mm +++ b/src/osx/iphone/msgdlg.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: msgdlg.cpp 54129 2008-06-11 19:30:52Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) - : wxMessageDialogWithCustomLabels(parent, message, caption, style) + : wxMessageDialogBase(parent, message, caption, style) { } @@ -57,7 +57,7 @@ int wxMessageDialog::ShowModal() msgtitle = m_message; msgtext = m_extendedMessage; } - + wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() ); wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() ); wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() ); @@ -67,7 +67,7 @@ int wxMessageDialog::ShowModal() wxCFStringRef cfText( msgtext, GetFont().GetEncoding() ); UIAlertView* alert = [[UIAlertView alloc] initWithTitle:cfTitle.AsNSString() message:cfText.AsNSString() delegate:nil cancelButtonTitle:nil otherButtonTitles:nil]; - + int buttonId[3] = { 0, 0, 0 }; int buttonCount = 0; @@ -109,8 +109,8 @@ int wxMessageDialog::ShowModal() wxNonOwnedWindow* parentWindow = NULL; int button = -1; - - if (GetParent()) + + if (GetParent()) { parentWindow = dynamic_cast(wxGetTopLevelParent(GetParent())); } @@ -119,9 +119,9 @@ int wxMessageDialog::ShowModal() if (parentWindow) { NSWindow* nativeParent = parentWindow->GetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate - didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) + ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; + [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate + didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil]; [sheetDelegate waitForSheetToFinish]; button = [sheetDelegate code]; @@ -133,6 +133,6 @@ int wxMessageDialog::ShowModal() [alert show]; } // [alert release]; - + return wxID_CANCEL; }