Add missing WXK constants for the control keys

[wxWidgets.git] / src / osx / cocoa / dirdlg.mm

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 9ab49d86ec3e12ddd5f96a504069c32924563b63..7d7dc66a2193e93de42814c758c0419d49d2823a 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm

-// Purpose:     wxDirDialog  
+// Purpose:     wxDirDialog

 // Author:      Stefan Csomor
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2008-08-30
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -31,6 +31,7 @@
 #endif
 
 #include "wx/filename.h"
 #endif
 
 #include "wx/filename.h"

+#include "wx/evtloop.h"

 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 


@@ -45,64 +46,90 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
     SetMessage( message );
     SetWindowStyle(style);
     SetPath(defaultPath);
     SetMessage( message );
     SetWindowStyle(style);
     SetPath(defaultPath);

+    m_sheetDelegate = [[ModalDialogDelegate alloc] init];
+    [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this];

 }
 
 }
 

+wxDirDialog::~wxDirDialog()
+{
+    [m_sheetDelegate release];
+}

 
 

-int wxDirDialog::ShowModal()
+void wxDirDialog::ShowWindowModal()

 {
 {

-    int result = wxID_CANCEL;
+    wxCFStringRef dir( m_path );
+    
+    m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;

     
     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];
     
     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];

-    
+

     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];
     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];

- 
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) ) 
-        [oPanel setCanCreateDirectories:YES];

 
 

-    wxCFStringRef dir( m_path );
+    if ( HasFlag(wxDD_NEW_DIR_BUTTON) )
+        [oPanel setCanCreateDirectories:YES];

     
     

-    m_path = wxEmptyString;
-

     wxNonOwnedWindow* parentWindow = NULL;
     wxNonOwnedWindow* parentWindow = NULL;

-    int returnCode = -1;

     
     

-    if (GetParent()) 
-    {
+    if (GetParent())

         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));

-    }
-    else
-    {
-        fprintf(stderr, "No parent!\n");
-    }
-
-/*    
+    
+    wxASSERT_MSG(parentWindow, "Window modal display requires parent.");
+    

     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();
     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:) 
+        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil
+            modalForWindow: nativeParent modalDelegate: m_sheetDelegate
+            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

             contextInfo: nil];
             contextInfo: nil];

-        [sheetDelegate waitForSheetToFinish];
-        returnCode = [sheetDelegate code];
-        [sheetDelegate release];
-    }
-    else
-*/
-    {
-        returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];

     }
     }

+}
+
+int wxDirDialog::ShowModal()
+{
+    wxCFEventLoopPauseIdleEvents pause;
+
+    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) )
+        [oPanel setCanCreateDirectories:YES];
+
+    wxCFStringRef dir( m_path );
+
+    m_path = wxEmptyString;
+
+    int returnCode = -1;
+
+    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 )
     {
     if (returnCode == NSOKButton )
     {

+        NSOpenPanel* oPanel = (NSOpenPanel*)panel;

         SetPath( wxCFStringRef::AsString([[oPanel filenames] objectAtIndex:0]));
         result = wxID_OK;
     }
         SetPath( wxCFStringRef::AsString([[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
 }
 
 #endif // wxUSE_DIRDLG