fixed wxTaskBarIcon compilation

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

diff --git a/src/mac/dirdlg.cpp b/src/mac/dirdlg.cpp
index 89b3892451a5fd8ce04cc44f1f4c3666fe1a0f5a..83533f1236711365c82828ecadfabb3b500e8d2c 100644 (file)
--- a/src/mac/dirdlg.cpp
+++ b/src/mac/dirdlg.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/cmndata.h"
 
 
 #include "wx/cmndata.h"
 

-#if defined(__UNIX__)
+#ifdef __DARWIN__

   #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>
   #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>


@@ -492,7 +492,7 @@ int wxDirDialog::ShowModal()
                }
                else
                {
                }
                else
                {

-                       m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;

                        return wxID_OK ;
                }
                return wxID_CANCEL;
                        return wxID_OK ;
                }
                return wxID_CANCEL;


@@ -589,7 +589,7 @@ int wxDirDialog::ShowModal()
                                                   name, &outFileSpec);
                                                        
                        // outFolderDirID = thePB.dirInfo.ioDrDirID;
                                                   name, &outFileSpec);
                                                        
                        // outFolderDirID = thePB.dirInfo.ioDrDirID;

-                       m_path = wxMacFSSpec2UnixFilename( &outFileSpec ) ;
+                       m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;

                        return wxID_OK ;
                }
                return wxID_CANCEL;
                        return wxID_OK ;
                }
                return wxID_CANCEL;