Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSRef transition

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-08-24 19:39:50 +00:00
parent f81f59012d
commit a2b772607a
14 changed files with 303 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/mac/carbon/utils.cpp
View File

@@ -33,12 +33,7 @@
#include <string.h>
#include <stdarg.h>
#ifdef __DARWIN__
# include "MoreFilesX.h"
#else
# include "MoreFiles.h"
# include "MoreFilesExtras.h"
#endif
#include "MoreFilesX.h"
#ifndef __DARWIN__
#include <Threads.h>
@@ -524,18 +519,12 @@ wxString wxMacFindFolder( short vol,
OSType folderType,
Boolean createFolder)
{
short vRefNum ;
long dirID ;
FSRef fsRef ;
wxString strDir ;
if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
{
FSSpec file ;
if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
{
strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
}
}
if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
strDir = wxMacFSRefToPath( &fsRef ) ;
return strDir ;
}
@@ -667,20 +656,28 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
p = p + wxT(":") ;
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 ) ;
}
OSErr err = noErr ;
FSRef fsRef ;
err = wxMacPathToFSRef( p , &fsRef ) ;
if ( noErr == err )
{
FSVolumeRefNum vRefNum ;
err = FSGetVRefNum( &fsRef , &vRefNum ) ;
if ( noErr == err )
{
UInt64 freeBytes , totalBytes ;
err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
if ( noErr == err )
{
if ( pTotal )
*pTotal = wxLongLong( totalBytes ) ;
if ( pFree )
*pFree = wxLongLong( freeBytes ) ;
}
}
}
return err == noErr ;
}
#endif // !__DARWIN__