Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 59f77683c79593a1439607ce76ded497228cfa16..ad757e2adcc60f35b617821bac84d9c71908e671 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -32,6 +32,7 @@
 
 #include "wx/filename.h"
 #include "wx/evtloop.h"
+#include "wx/testing.h"
 
 #include "wx/osx/private.h"
 
@@ -94,6 +95,8 @@ void wxDirDialog::ShowWindowModal()
 
 int wxDirDialog::ShowModal()
 {
+    WX_TESTING_SHOW_MODAL_HOOK();
+
     wxCFEventLoopPauseIdleEvents pause;
 
     NSOpenPanel *oPanel = OSXCreatePanel();
@@ -117,7 +120,7 @@ void wxDirDialog::ModalFinishedCallback(void* panel, int returnCode)
     if (returnCode == NSOKButton )
     {
         NSOpenPanel* oPanel = (NSOpenPanel*)panel;
-        SetPath( wxCFStringRef::AsString([[oPanel filenames] objectAtIndex:0]));
+        SetPath( wxCFStringRef::AsStringWithNormalizationFormC([[oPanel filenames] objectAtIndex:0]));
         result = wxID_OK;
     }
     SetReturnCode(result);