wxMac:

[wxWidgets.git] / src / mac / dirdlg.cpp

diff --git a/src/mac/dirdlg.cpp b/src/mac/dirdlg.cpp
index 51f4df142e2ada43fdb84b493e2a6fec284c9284..e1255db7e1194af75eb32862a22db93565cbcd27 100644 (file)
--- a/src/mac/dirdlg.cpp
+++ b/src/mac/dirdlg.cpp
@@ -20,7 +20,11 @@
 
 #include "wx/cmndata.h"
 
-#include "Navigation.h"
+#if defined(__UNIX__)
+  #include <NavigationServices/Navigation.h>
+#else
+  #include <Navigation.h>
+#endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
@@ -457,11 +461,18 @@ int wxDirDialog::ShowModal()
                Str255                          prompt ;
                Str255                          path ;
 
+#if TARGET_CARBON
+               c2pstrcpy((StringPtr)prompt, m_message) ;
+#else
                strcpy((char *)prompt, m_message) ;
                c2pstr((char *)prompt ) ;
-       
+#endif
+#if TARGET_CARBON
+               c2pstrcpy((StringPtr)path, m_path ) ;
+#else
                strcpy((char *)path, m_path ) ;
                c2pstr((char *)path ) ;
+#endif
 
                StandardFileReply       reply ;
                FileFilterYDUPP         invisiblesExcludedCustomFilterUPP = 0 ;