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

use MoreFiles under Mac OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-13 21:12:44 +00:00
parent b9b7804a43
commit da2b4b7a57
5 changed files with 111 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/filefn.cpp
View File

@@ -115,11 +115,11 @@
extern wxChar *wxBuffer; extern wxChar *wxBuffer;
#if defined(__WXMAC__) && !defined(__UNIX__) #ifdef __WXMAC__
#include "morefile.h" # include "MoreFiles.h"
#include "moreextr.h" # include "MoreFilesExtras.h"
#include "fullpath.h" # include "FullPath.h"
#include "fspcompa.h" # include "FSpCompat.h"
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
@@ -143,7 +143,11 @@ const off_t wxInvalidOffset = (off_t)-1;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// we need to translate Mac filenames before passing them to OS functions // we need to translate Mac filenames before passing them to OS functions
#if defined(__WXMAC__) && defined(__DARWIN__)
#define OS_FILENAME(s) wxMac2UnixFilename(s.fn_str())
#else
#define OS_FILENAME(s) (s.fn_str()) #define OS_FILENAME(s) (s.fn_str())
#endif
// ============================================================================ // ============================================================================
// implementation // implementation
@@ -829,7 +833,7 @@ wxString wxPathOnly (const wxString& path)
// and back again - or we get nasty problems with delimiters. // and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX. // Also, convert to lower case, since case is significant in UNIX.
#if defined(__WXMAC__) && !defined(__UNIX__) #if defined(__WXMAC__)
wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
{ {
Handle myPath ; Handle myPath ;
@@ -1703,7 +1707,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
char *cbuf = new char[sz+1]; char *cbuf = new char[sz+1];
#ifdef _MSC_VER #ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) { if (_getcwd(cbuf, sz) == NULL) {
#elif defined(__WXMAC__) && !defined(__UNIX__) #elif defined(__WXMAC__)
enum enum
{ {
SFSaveDisk = 0x214, CurDirStore = 0x398 SFSaveDisk = 0x214, CurDirStore = 0x398

118
src/mac/carbon/filedlg.cpp
View File

@@ -34,10 +34,8 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
#include <Navigation.h> #include <Navigation.h>
#endif #endif
#ifndef __DARWIN__ #include "MoreFiles.h"
#include "MoreFiles.h" #include "MoreFilesExtras.h"
#include "MoreFilesExtras.h"
#endif
extern bool gUseNavServices ; extern bool gUseNavServices ;
@@ -302,6 +300,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
} }
} }
#if !TARGET_CARBON
void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR ) void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
{ {
Point thePt; Point thePt;
@@ -314,7 +314,6 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
OSErr err; OSErr err;
SFTypeList types ; SFTypeList types ;
// presumably we're running System 7 or later so CustomGetFile is // presumably we're running System 7 or later so CustomGetFile is
// available // available
@@ -327,8 +326,6 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
MakeUserDataRec( &myData , filter ) ; MakeUserDataRec( &myData , filter ) ;
// display the dialog // display the dialog
#if !TARGET_CARBON
dlgHookUPP = NULL ; dlgHookUPP = NULL ;
// dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook); // dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter); myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);
@@ -338,21 +335,20 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
ParamText( message , NULL , NULL , NULL ) ; ParamText( message , NULL , NULL , NULL ) ;
CustomGetFile( fileFilter, CustomGetFile( fileFilter,
-1, // show all types -1, // show all types
NULL, NULL,
theSFR, theSFR,
kSFGetFileDlgID, kSFGetFileDlgID,
thePt, // top left point thePt, // top left point
dlgHookUPP, dlgHookUPP,
myModalFilterUPP, myModalFilterUPP,
nil, // activate list nil, // activate list
nil, // activate proc nil, // activate proc
&myData); &myData);
DisposeRoutineDescriptor(dlgHookUPP); DisposeRoutineDescriptor(dlgHookUPP);
DisposeRoutineDescriptor(myModalFilterUPP); DisposeRoutineDescriptor(myModalFilterUPP);
#else
#endif
// if cancel wasn't pressed and no fatal error occurred... // if cancel wasn't pressed and no fatal error occurred...
if (theSFR->sfGood) if (theSFR->sfGood)
@@ -363,7 +359,7 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
if (theSFR->sfFile.name[0] == '\0') if (theSFR->sfFile.name[0] == '\0')
{ {
err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID, err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,
"\p", &tempSpec); "\p", &tempSpec);
if (err == noErr) if (err == noErr)
{ {
theSFR->sfFile = tempSpec; theSFR->sfFile = tempSpec;
@@ -406,38 +402,45 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
} }
} }
} }
#endif
static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
{ {
Str255 filename ; Str255 filename ;
PLstrcpy( filename , name ) ;
#if TARGET_CARBON
p2cstrcpy((char *)filename, name) ;
#else
PLstrcpy( filename , name ) ;
p2cstr( filename ) ; p2cstr( filename ) ;
#endif
wxString file(filename) ; wxString file(filename) ;
file.MakeUpper() ; file.MakeUpper() ;
if ( data->numfilters > 0 ) if ( data->numfilters > 0 )
{ {
//for ( int i = 0 ; i < data->numfilters ; ++i ) //for ( int i = 0 ; i < data->numfilters ; ++i )
int i = data->currentfilter ; int i = data->currentfilter ;
if ( data->extensions[i].Right(2) == ".*" ) if ( data->extensions[i].Right(2) == ".*" )
return true ; return true ;
{ {
if ( type == data->filtermactypes[i] ) if ( type == data->filtermactypes[i] )
return true ; return true ;
wxString extension = data->extensions[i] ; wxString extension = data->extensions[i] ;
if ( extension.GetChar(0) == '*' ) if ( extension.GetChar(0) == '*' )
extension = extension.Mid(1) ; extension = extension.Mid(1) ;
if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) ) if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
return true ; return true ;
} }
return false ; return false ;
} }
return true ; return true ;
} }
#if !TARGET_CARBON
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr) static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{ {
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
@@ -462,6 +465,7 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
return false ; return false ;
} }
#endif
// end wxmac // end wxmac
@@ -571,7 +575,7 @@ pascal Boolean CrossPlatformFilterCallback (
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
#if !TARGET_CARBON #if !TARGET_CARBON
if ( !gUseNavServices ) if ( !gUseNavServices )
{ {
if ( m_dialogStyle & wxSAVE ) if ( m_dialogStyle & wxSAVE )
@@ -580,25 +584,12 @@ int wxFileDialog::ShowModal()
Str255 prompt ; Str255 prompt ;
Str255 filename ; Str255 filename ;
#if TARGET_CARBON
c2pstrcpy((StringPtr)prompt, m_message) ;
#else
strcpy((char *)prompt, m_message) ; strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ; c2pstr((char *)prompt ) ;
#endif
#if TARGET_CARBON
c2pstrcpy((StringPtr)filename, m_fileName) ;
#else
strcpy((char *)filename, m_fileName) ; strcpy((char *)filename, m_fileName) ;
c2pstr((char *)filename ) ; c2pstr((char *)filename ) ;
#endif
#if !TARGET_CARBON
StandardPutFile( prompt , filename , &reply ) ; StandardPutFile( prompt , filename , &reply ) ;
#else
#endif
if ( reply.sfGood == false ) if ( reply.sfGood == false )
{ {
m_path = "" ; m_path = "" ;
@@ -616,30 +607,17 @@ int wxFileDialog::ShowModal()
Str255 prompt ; Str255 prompt ;
Str255 path ; Str255 path ;
#if TARGET_CARBON
c2pstrcpy((StringPtr)prompt, m_message) ;
#else
strcpy((char *)prompt, m_message) ; strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ; c2pstr((char *)prompt ) ;
#endif
#if TARGET_CARBON
c2pstrcpy((StringPtr)path, m_dir ) ;
#else
strcpy((char *)path, m_dir ) ; strcpy((char *)path, m_dir ) ;
c2pstr((char *)path ) ; c2pstr((char *)path ) ;
#endif
StandardFileReply reply ; StandardFileReply reply ;
FileFilterYDUPP crossPlatformFileFilterUPP = 0 ; FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
#if !TARGET_CARBON
crossPlatformFileFilterUPP = crossPlatformFileFilterUPP =
NewFileFilterYDProc(CrossPlatformFileFilter); NewFileFilterYDProc(CrossPlatformFileFilter);
#endif
ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply); ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
#if !TARGET_CARBON
DisposeFileFilterYDUPP(crossPlatformFileFilterUPP); DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
#endif
if ( reply.sfGood == false ) if ( reply.sfGood == false )
{ {
m_path = "" ; m_path = "" ;

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

@@ -27,10 +27,8 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef __DARWIN__ #include "MoreFiles.h"
#include "MoreFiles.h" #include "MoreFilesExtras.h"
#include "MoreFilesExtras.h"
#endif
#ifndef __DARWIN__ #ifndef __DARWIN__
// defined in unix/utilsunx.cpp for Mac OS X // defined in unix/utilsunx.cpp for Mac OS X
@@ -320,7 +318,6 @@ bool wxIsBusy()
return (wxBusyCursorCount > 0); return (wxBusyCursorCount > 0);
} }
#ifndef __DARWIN__
wxString wxMacFindFolder( short vol, wxString wxMacFindFolder( short vol,
OSType folderType, OSType folderType,
Boolean createFolder) Boolean createFolder)
@@ -339,7 +336,6 @@ wxString wxMacFindFolder( short vol,
} }
return strDir ; return strDir ;
} }
#endif
#ifndef __DARWIN__ #ifndef __DARWIN__
char *wxGetUserHome (const wxString& user) char *wxGetUserHome (const wxString& user)
@@ -349,7 +345,6 @@ char *wxGetUserHome (const wxString& user)
} }
#endif #endif
#ifndef __DARWIN__
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
if ( path.empty() ) if ( path.empty() )
@@ -383,7 +378,6 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
return err == noErr ; return err == noErr ;
} }
#endif
// Check whether this window wants to process messages, e.g. Stop button // Check whether this window wants to process messages, e.g. Stop button
// in long calculations. // in long calculations.

118
src/mac/filedlg.cpp
View File

@@ -34,10 +34,8 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
#include <Navigation.h> #include <Navigation.h>
#endif #endif
#ifndef __DARWIN__ #include "MoreFiles.h"
#include "MoreFiles.h" #include "MoreFilesExtras.h"
#include "MoreFilesExtras.h"
#endif
extern bool gUseNavServices ; extern bool gUseNavServices ;
@@ -302,6 +300,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
} }
} }
#if !TARGET_CARBON
void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR ) void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
{ {
Point thePt; Point thePt;
@@ -314,7 +314,6 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
OSErr err; OSErr err;
SFTypeList types ; SFTypeList types ;
// presumably we're running System 7 or later so CustomGetFile is // presumably we're running System 7 or later so CustomGetFile is
// available // available
@@ -327,8 +326,6 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
MakeUserDataRec( &myData , filter ) ; MakeUserDataRec( &myData , filter ) ;
// display the dialog // display the dialog
#if !TARGET_CARBON
dlgHookUPP = NULL ; dlgHookUPP = NULL ;
// dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook); // dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter); myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);
@@ -338,21 +335,20 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
ParamText( message , NULL , NULL , NULL ) ; ParamText( message , NULL , NULL , NULL ) ;
CustomGetFile( fileFilter, CustomGetFile( fileFilter,
-1, // show all types -1, // show all types
NULL, NULL,
theSFR, theSFR,
kSFGetFileDlgID, kSFGetFileDlgID,
thePt, // top left point thePt, // top left point
dlgHookUPP, dlgHookUPP,
myModalFilterUPP, myModalFilterUPP,
nil, // activate list nil, // activate list
nil, // activate proc nil, // activate proc
&myData); &myData);
DisposeRoutineDescriptor(dlgHookUPP); DisposeRoutineDescriptor(dlgHookUPP);
DisposeRoutineDescriptor(myModalFilterUPP); DisposeRoutineDescriptor(myModalFilterUPP);
#else
#endif
// if cancel wasn't pressed and no fatal error occurred... // if cancel wasn't pressed and no fatal error occurred...
if (theSFR->sfGood) if (theSFR->sfGood)
@@ -363,7 +359,7 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
if (theSFR->sfFile.name[0] == '\0') if (theSFR->sfFile.name[0] == '\0')
{ {
err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID, err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,
"\p", &tempSpec); "\p", &tempSpec);
if (err == noErr) if (err == noErr)
{ {
theSFR->sfFile = tempSpec; theSFR->sfFile = tempSpec;
@@ -406,38 +402,45 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
} }
} }
} }
#endif
static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
{ {
Str255 filename ; Str255 filename ;
PLstrcpy( filename , name ) ;
#if TARGET_CARBON
p2cstrcpy((char *)filename, name) ;
#else
PLstrcpy( filename , name ) ;
p2cstr( filename ) ; p2cstr( filename ) ;
#endif
wxString file(filename) ; wxString file(filename) ;
file.MakeUpper() ; file.MakeUpper() ;
if ( data->numfilters > 0 ) if ( data->numfilters > 0 )
{ {
//for ( int i = 0 ; i < data->numfilters ; ++i ) //for ( int i = 0 ; i < data->numfilters ; ++i )
int i = data->currentfilter ; int i = data->currentfilter ;
if ( data->extensions[i].Right(2) == ".*" ) if ( data->extensions[i].Right(2) == ".*" )
return true ; return true ;
{ {
if ( type == data->filtermactypes[i] ) if ( type == data->filtermactypes[i] )
return true ; return true ;
wxString extension = data->extensions[i] ; wxString extension = data->extensions[i] ;
if ( extension.GetChar(0) == '*' ) if ( extension.GetChar(0) == '*' )
extension = extension.Mid(1) ; extension = extension.Mid(1) ;
if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) ) if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
return true ; return true ;
} }
return false ; return false ;
} }
return true ; return true ;
} }
#if !TARGET_CARBON
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr) static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{ {
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
@@ -462,6 +465,7 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
return false ; return false ;
} }
#endif
// end wxmac // end wxmac
@@ -571,7 +575,7 @@ pascal Boolean CrossPlatformFilterCallback (
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
#if !TARGET_CARBON #if !TARGET_CARBON
if ( !gUseNavServices ) if ( !gUseNavServices )
{ {
if ( m_dialogStyle & wxSAVE ) if ( m_dialogStyle & wxSAVE )
@@ -580,25 +584,12 @@ int wxFileDialog::ShowModal()
Str255 prompt ; Str255 prompt ;
Str255 filename ; Str255 filename ;
#if TARGET_CARBON
c2pstrcpy((StringPtr)prompt, m_message) ;
#else
strcpy((char *)prompt, m_message) ; strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ; c2pstr((char *)prompt ) ;
#endif
#if TARGET_CARBON
c2pstrcpy((StringPtr)filename, m_fileName) ;
#else
strcpy((char *)filename, m_fileName) ; strcpy((char *)filename, m_fileName) ;
c2pstr((char *)filename ) ; c2pstr((char *)filename ) ;
#endif
#if !TARGET_CARBON
StandardPutFile( prompt , filename , &reply ) ; StandardPutFile( prompt , filename , &reply ) ;
#else
#endif
if ( reply.sfGood == false ) if ( reply.sfGood == false )
{ {
m_path = "" ; m_path = "" ;
@@ -616,30 +607,17 @@ int wxFileDialog::ShowModal()
Str255 prompt ; Str255 prompt ;
Str255 path ; Str255 path ;
#if TARGET_CARBON
c2pstrcpy((StringPtr)prompt, m_message) ;
#else
strcpy((char *)prompt, m_message) ; strcpy((char *)prompt, m_message) ;
c2pstr((char *)prompt ) ; c2pstr((char *)prompt ) ;
#endif
#if TARGET_CARBON
c2pstrcpy((StringPtr)path, m_dir ) ;
#else
strcpy((char *)path, m_dir ) ; strcpy((char *)path, m_dir ) ;
c2pstr((char *)path ) ; c2pstr((char *)path ) ;
#endif
StandardFileReply reply ; StandardFileReply reply ;
FileFilterYDUPP crossPlatformFileFilterUPP = 0 ; FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
#if !TARGET_CARBON
crossPlatformFileFilterUPP = crossPlatformFileFilterUPP =
NewFileFilterYDProc(CrossPlatformFileFilter); NewFileFilterYDProc(CrossPlatformFileFilter);
#endif
ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply); ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
#if !TARGET_CARBON
DisposeFileFilterYDUPP(crossPlatformFileFilterUPP); DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
#endif
if ( reply.sfGood == false ) if ( reply.sfGood == false )
{ {
m_path = "" ; m_path = "" ;

10
src/mac/utils.cpp
View File

@@ -27,10 +27,8 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef __DARWIN__ #include "MoreFiles.h"
#include "MoreFiles.h" #include "MoreFilesExtras.h"
#include "MoreFilesExtras.h"
#endif
#ifndef __DARWIN__ #ifndef __DARWIN__
// defined in unix/utilsunx.cpp for Mac OS X // defined in unix/utilsunx.cpp for Mac OS X
@@ -320,7 +318,6 @@ bool wxIsBusy()
return (wxBusyCursorCount > 0); return (wxBusyCursorCount > 0);
} }
#ifndef __DARWIN__
wxString wxMacFindFolder( short vol, wxString wxMacFindFolder( short vol,
OSType folderType, OSType folderType,
Boolean createFolder) Boolean createFolder)
@@ -339,7 +336,6 @@ wxString wxMacFindFolder( short vol,
} }
return strDir ; return strDir ;
} }
#endif
#ifndef __DARWIN__ #ifndef __DARWIN__
char *wxGetUserHome (const wxString& user) char *wxGetUserHome (const wxString& user)
@@ -349,7 +345,6 @@ char *wxGetUserHome (const wxString& user)
} }
#endif #endif
#ifndef __DARWIN__
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
if ( path.empty() ) if ( path.empty() )
@@ -383,7 +378,6 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
return err == noErr ; return err == noErr ;
} }
#endif
// Check whether this window wants to process messages, e.g. Stop button // Check whether this window wants to process messages, e.g. Stop button
// in long calculations. // in long calculations.