X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a905992cf7eb7a5734133fc95944b98dde9c00d5..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/cocoa/dirdlg.mm diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm index 4f5063ba61..02f92f94f8 100644 --- a/src/osx/cocoa/dirdlg.mm +++ b/src/osx/cocoa/dirdlg.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/osx/cocoa/dirdlg.mm -// Purpose: wxDirDialog +// Purpose: wxDirDialog // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 2008-08-30 -// RCS-ID: $Id: dirdlg.mm 40007 2006-07-05 13:10:46Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,78 +31,102 @@ #endif #include "wx/filename.h" +#include "wx/evtloop.h" +#include "wx/modalhook.h" #include "wx/osx/private.h" IMPLEMENT_CLASS(wxDirDialog, wxDialog) wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message, - const wxString& defaultPath, long style, const wxPoint& pos, - const wxSize& size, const wxString& name) + const wxString& defaultPath, long style, const wxPoint& WXUNUSED(pos), + const wxSize& WXUNUSED(size), const wxString& WXUNUSED(name)) { m_parent = parent; SetMessage( message ); SetWindowStyle(style); SetPath(defaultPath); + m_sheetDelegate = [[ModalDialogDelegate alloc] init]; + [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this]; } +wxDirDialog::~wxDirDialog() +{ + [m_sheetDelegate release]; +} -int wxDirDialog::ShowModal() +WX_NSOpenPanel wxDirDialog::OSXCreatePanel() const { - int result = wxID_CANCEL; - NSOpenPanel *oPanel = [NSOpenPanel openPanel]; [oPanel setCanChooseDirectories:YES]; [oPanel setResolvesAliases:YES]; [oPanel setCanChooseFiles:NO]; - + wxCFStringRef cf( m_message ); [oPanel setMessage:cf.AsNSString()]; - - if ( HasFlag(wxDD_NEW_DIR_BUTTON) ) + + if ( !HasFlag(wxDD_DIR_MUST_EXIST) ) [oPanel setCanCreateDirectories:YES]; + return oPanel; +} + +void wxDirDialog::ShowWindowModal() +{ + wxNonOwnedWindow* parentWindow = NULL; + + if (GetParent()) + parentWindow = dynamic_cast(wxGetTopLevelParent(GetParent())); + + wxCHECK_RET(parentWindow, "Window modal display requires parent."); + + m_modality = wxDIALOG_MODALITY_WINDOW_MODAL; + + NSOpenPanel *oPanel = OSXCreatePanel(); + + NSWindow* nativeParent = parentWindow->GetWXWindow(); wxCFStringRef dir( m_path ); - + [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil + modalForWindow: nativeParent modalDelegate: m_sheetDelegate + didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) + contextInfo: nil]; +} + +int wxDirDialog::ShowModal() +{ + WX_HOOK_MODAL_DIALOG(); + + wxCFEventLoopPauseIdleEvents pause; + + NSOpenPanel *oPanel = OSXCreatePanel(); + + wxCFStringRef dir( m_path ); + m_path = wxEmptyString; - wxNonOwnedWindow* parentWindow = NULL; int returnCode = -1; - - if (GetParent()) - { - parentWindow = dynamic_cast(wxGetTopLevelParent(GetParent())); - } - else - { - fprintf(stderr, "No parent!\n"); - } - - if (parentWindow) - { - NSWindow* nativeParent = parentWindow->GetWXWindow(); - ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; - [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil - modalForWindow: nativeParent modalDelegate: sheetDelegate - didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) - contextInfo: nil]; - [sheetDelegate waitForSheetToFinish]; - returnCode = [sheetDelegate code]; - [sheetDelegate release]; - } - else - { - returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil]; - } + + returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil]; + ModalFinishedCallback(oPanel, returnCode); + + return GetReturnCode(); +} + +void wxDirDialog::ModalFinishedCallback(void* panel, int returnCode) +{ + int result = wxID_CANCEL; + if (returnCode == NSOKButton ) { - wxCFStringRef resultpath( [[[oPanel filenames] objectAtIndex:0] retain] ); - - SetPath( resultpath.AsString() ); + NSOpenPanel* oPanel = (NSOpenPanel*)panel; + SetPath( wxCFStringRef::AsStringWithNormalizationFormC([[oPanel filenames] objectAtIndex:0])); result = wxID_OK; } - return result; + SetReturnCode(result); + + if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL) + SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); } #endif // wxUSE_DIRDLG