X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/618a5e382af2e469f9cc9d2aa81114403637a4b3..ef3a5e0aae003c29941c7d41ed6becea4287752d:/src/generic/dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index da81aff518..7df3852fe2 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -68,8 +68,8 @@
 
 #endif // __WXPM__
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
-#include "moreextr.h"
+#if defined(__WXMAC__)
+#  include "MoreFilesExtras.h"
 #endif
 
 #ifdef __BORLANDC__
@@ -538,7 +538,7 @@ void wxGenericDirCtrl::SetupSections()
 {
 #if defined(__WXMSW__) || defined(__WXPM__)
 
-#ifdef __WIN32__
+# ifdef __WIN32__
     wxChar driveBuffer[256];
     size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
     size_t i = 0;
@@ -580,7 +580,7 @@ void wxGenericDirCtrl::SetupSections()
         if (driveBuffer[i] == wxT('\0'))
             break;
     }
-#else
+# else
     int drive;
     int currentDrive;
 
@@ -597,8 +597,8 @@ void wxGenericDirCtrl::SetupSections()
             AddSection(path, name);
         }
     }
-#endif
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+# endif
+#elif defined(__WXMAC__)
     FSSpec volume ;
     short index = 1 ;
     while(1) {
@@ -607,7 +607,7 @@ void wxGenericDirCtrl::SetupSections()
         break ;
 
       wxString name = wxMacFSSpec2MacFilename( &volume ) ;
-      AddSection(name+":", name, 0);
+      AddSection(name + wxFILE_SEP_PATH, name, 0);
     }
 #else
   AddSection(wxT("/"), _("The Computer"), 0);