guarding open combo box against AppDefined NSEvents issued by wxEventLoop::WakeUp...

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

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 700969c3ee598d851fd7cd469ec4b5fba9ed52bc..02f92f94f834021452b8ae1fef664c9c9fce5ede 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -32,7 +32,7 @@
 
 #include "wx/filename.h"
 #include "wx/evtloop.h"
 
 #include "wx/filename.h"
 #include "wx/evtloop.h"

-#include "wx/testing.h"
+#include "wx/modalhook.h"

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


@@ -95,7 +95,7 @@ void wxDirDialog::ShowWindowModal()
 
 int wxDirDialog::ShowModal()
 {
 
 int wxDirDialog::ShowModal()
 {

-    WX_TESTING_SHOW_MODAL_HOOK();
+    WX_HOOK_MODAL_DIALOG();

 
     wxCFEventLoopPauseIdleEvents pause;
 
 
     wxCFEventLoopPauseIdleEvents pause;
 


@@ -120,7 +120,7 @@ void wxDirDialog::ModalFinishedCallback(void* panel, int returnCode)
     if (returnCode == NSOKButton )
     {
         NSOpenPanel* oPanel = (NSOpenPanel*)panel;
     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);
         result = wxID_OK;
     }
     SetReturnCode(result);