no changes

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 6f27f881aab8402a9d2392ae5758a632de3c96d8..de1b5eb30126f3f52490ec5eae91611010ce318e 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -67,6 +67,10 @@
 
 #endif // __WXPM__
 
 
 #endif // __WXPM__
 

+#if defined(__WXMAC__) && !defined(__UNIX__)
+#include "moreextr.h"
+#endif
+

 #ifdef __BORLANDC__
 #include "dos.h"
 #endif
 #ifdef __BORLANDC__
 #include "dos.h"
 #endif


@@ -308,18 +312,18 @@ static const int ID_NEW = 1004;
 #if defined(__WXMSW__) || defined(__WXPM__)
 int setdrive(int drive)
 {
 #if defined(__WXMSW__) || defined(__WXPM__)
 int setdrive(int drive)
 {

-       char  newdrive[3];
+       wxChar  newdrive[3];

 
        if (drive < 1 || drive > 31)
                return -1;
 
        if (drive < 1 || drive > 31)
                return -1;

-       newdrive[0] = (char)('A' + (char)drive - (char)1);
-       newdrive[1] = ':';
-       newdrive[2] = '\0';
+       newdrive[0] = (wxChar)(wxT('A') + drive - 1);
+       newdrive[1] = wxT(':');
+       newdrive[2] = wxT('\0');

 #if defined(__WXMSW__)
 #ifdef __WIN16__
     if (wxSetWorkingDirectory(newdrive))
 #else
 #if defined(__WXMSW__)
 #ifdef __WIN16__
     if (wxSetWorkingDirectory(newdrive))
 #else

-       if (SetCurrentDirectory((LPSTR)newdrive))
+       if (::SetCurrentDirectory(newdrive))

 #endif
 #else
     // VA doesn't know what LPSTR is and has its own set
 #endif
 #else
     // VA doesn't know what LPSTR is and has its own set


@@ -593,7 +597,17 @@ void wxGenericDirCtrl::SetupSections()
         }
     }
 #endif
         }
     }
 #endif

-
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+    FSSpec volume ;
+    short index = 1 ;
+    while(1) {
+      short actualCount = 0 ;
+      if ( OnLine( &volume , 1 , &actualCount , &index ) != noErr || actualCount == 0 )
+        break ;
+
+      wxString name = wxMacFSSpec2MacFilename( &volume ) ;
+      AddSection(name+":", name, 0);
+    }

 #else
   AddSection(wxT("/"), _("The Computer"), 0);
   AddSection(wxGetHomeDir(), _("My Home"), 0 );
 #else
   AddSection(wxT("/"), _("The Computer"), 0);
   AddSection(wxGetHomeDir(), _("My Home"), 0 );