Removed include/wx/setup.h from filelist.txt -- Needed for autotools build,

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 1a71c0c7840173ec28e56c6a1a8418bc9fada85f..41da489e3b0ec377bcf7a42026d39914ab12a335 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.

-// #pragma implementation

 // #pragma implementation "utils.h"
 #endif
 
 // #pragma implementation "utils.h"
 #endif
 


@@ -27,7 +26,10 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#ifndef __UNIX__
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"
+
+#ifndef __DARWIN__

 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)
 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)


@@ -127,11 +129,11 @@ long wxGetFreeMemory()
 
 void wxUsleep(unsigned long milliseconds)
 {
 
 void wxUsleep(unsigned long milliseconds)
 {

-               clock_t start = clock() ;
-               do 
-               {
-                       YieldToAnyThread() ;
-               } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+    clock_t start = clock() ;
+    do 
+    {
+       YieldToAnyThread() ;
+    } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;

 }
 
 void wxSleep(int nSecs)
 }
 
 void wxSleep(int nSecs)


@@ -178,7 +180,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
   wxMessageBox(wxBuffer);
   wxExit();
 }

-#endif // !__UNIX__
+#endif // !__DARWIN__

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -188,11 +190,22 @@ void wxBell()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-       long theSystem ;
-  Gestalt(gestaltSystemVersion, &theSystem) ;
-  *minorVsn = (theSystem & 0xFF ) ;
-  *majorVsn = (theSystem >> 8 ) ; // are there x-platform conventions ?
-  return wxMACINTOSH;
+    long theSystem ;
+    
+    // are there x-platform conventions ?
+
+    Gestalt(gestaltSystemVersion, &theSystem) ;
+    if (minorVsn != NULL) {
+       *minorVsn = (theSystem & 0xFF ) ;
+    }
+    if (majorVsn != NULL) {
+       *majorVsn = (theSystem >> 8 ) ;
+    }
+#ifdef __DARWIN__
+    return wxMAC_DARWIN;
+#else
+    return wxMAC;
+#endif

 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)


@@ -315,10 +328,9 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
   return (wxBusyCursorCount > 0);
 }
 

-#ifndef __UNIX__
-wxString wxMacFindFolder( short                                        vol,
-                                                                OSType                                 folderType,
-                                                                Boolean                                createFolder)
+wxString wxMacFindFolder( short        vol,
+                         OSType       folderType,
+                         Boolean      createFolder)

 {
        short           vRefNum  ;
        long            dirID ;
 {
        short           vRefNum  ;
        long            dirID ;


@@ -329,19 +341,52 @@ wxString wxMacFindFolder( short                                   vol,
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {

-                       strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
+                       strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;

                }
        }
        return strDir ;
 }
                }
        }
        return strDir ;
 }

-#endif

 
 

-#ifndef __UNIX__
+#ifndef __DARWIN__

 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }

+
+bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+{
+    if ( path.empty() )
+        return FALSE;
+        
+    wxString p = path ;
+    if (p[0] == ':' ) {
+      p = wxGetCwd() + p ;
+    }
+    
+    int pos = p.Find(':') ;
+    if ( pos != wxNOT_FOUND ) {
+      p = p.Mid(1,pos) ;
+    }
+    
+    p = p + ":" ;
+    
+    Str255 volumeName ;
+    XVolumeParam pb ;
+
+    wxMacStringToPascal( p  , volumeName ) ;
+    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
+    if ( err == noErr ) {
+      if ( pTotal ) {
+        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
+      }
+      if ( pFree ) {
+        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
+      }
+    }
+
+    return err == noErr ;
+}

 #endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 #endif
 
 // Check whether this window wants to process messages, e.g. Stop button