added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index b3137eaf09bc728a6524077a1feb72a9b9749a45..f234da74566aafab7c5d7154d2e14f432e5ca34a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -27,7 +27,12 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#ifndef __UNIX__
+#ifndef __DARWIN__
+#  include "morefile.h"
+#  include "moreextr.h"
+#endif
+
+#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)


@@ -104,7 +109,7 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
   return TRUE;
 }
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -178,7 +183,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()


@@ -315,7 +320,7 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
   return (wxBusyCursorCount > 0);
 }
 

-#ifndef __UNIX__
+#ifndef __DARWIN__

 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)
 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)


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

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

                }
        }
        return strDir ;
 }
 #endif
 
                }
        }
        return strDir ;
 }
 #endif
 

-#ifndef __UNIX__
+#ifndef __DARWIN__

 char *wxGetUserHome (const wxString& user)
 {
     // TODO
 char *wxGetUserHome (const wxString& user)
 {
     // TODO


@@ -344,6 +349,42 @@ char *wxGetUserHome (const wxString& user)
 }
 #endif
 
 }
 #endif
 

+#ifndef __DARWIN__
+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
 // in long calculations.
 bool wxCheckForInterrupt(wxWindow *wnd)
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 bool wxCheckForInterrupt(wxWindow *wnd)