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

path/file corrections for Darwin/Mac OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-29 22:26:59 +00:00
parent 334d244877
commit e7e1b01eb5
4 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/fileconf.cpp
View File

@@ -257,7 +257,7 @@ wxString wxFileConfig::GetGlobalDir()
#ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
strDir = wxT("sys$manager:"); strDir = wxT("sys$manager:");
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ; strDir = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
#elif defined( __UNIX__ ) #elif defined( __UNIX__ )
strDir = wxT("/etc/"); strDir = wxT("/etc/");
#elif defined(__WXPM__) #elif defined(__WXPM__)
@@ -368,20 +368,20 @@ wxString wxFileConfig::GetLocalDir()
{ {
wxString strDir; wxString strDir;
#ifndef __WXMAC__ #if defined(__WXMAC__)
// no local dir concept on Mac OS 9
return GetGlobalDir() ;
#else
wxGetHomeDir(&strDir); wxGetHomeDir(&strDir);
#ifdef __UNIX__ # ifdef __UNIX__
#ifdef __VMS # ifdef __VMS
if (strDir.Last() != wxT(']')) if (strDir.Last() != wxT(']'))
#endif # endif
if (strDir.Last() != wxT('/')) strDir << wxT('/'); if (strDir.Last() != wxT('/')) strDir << wxT('/');
#else # else
if (strDir.Last() != wxT('\\')) strDir << wxT('\\'); if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
#endif # endif
#else
// no local dir concept on mac
return GetGlobalDir() ;
#endif #endif
return strDir; return strDir;
@@ -393,10 +393,10 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
str << szFile; str << szFile;
if ( wxStrchr(szFile, wxT('.')) == NULL ) if ( wxStrchr(szFile, wxT('.')) == NULL )
#ifdef __UNIX__ #if defined( __WXMAC__ )
str << wxT(".conf");
#elif defined( __WXMAC__ )
str << " Preferences"; str << " Preferences";
#elif defined( __UNIX__ )
str << wxT(".conf");
#else // Windows #else // Windows
str << wxT(".ini"); str << wxT(".ini");
#endif // UNIX/Win #endif // UNIX/Win
@@ -414,7 +414,7 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
wxString str = GetLocalDir(); wxString str = GetLocalDir();
#endif #endif
#if defined( __UNIX__ ) && !defined( __VMS ) #if defined( __UNIX__ ) && !defined( __VMS ) && !defined( __WXMAC__ )
str << wxT('.'); str << wxT('.');
#endif #endif
@@ -425,7 +425,6 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
str << wxT(".ini"); str << wxT(".ini");
#endif #endif
#ifdef __WXMAC__ #ifdef __WXMAC__
str << " Preferences"; str << " Preferences";
#endif #endif
@@ -950,7 +949,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
bool ret = file.Commit(); bool ret = file.Commit();
#if defined(__WXMAC__) && !defined(__UNIX__) #if defined(__WXMAC__)
if ( ret ) if ( ret )
{ {
FSSpec spec ; FSSpec spec ;
@@ -964,7 +963,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
FSpSetFInfo( &spec , &finfo ) ; FSpSetFInfo( &spec , &finfo ) ;
} }
} }
#endif // __WXMAC__ && !__UNIX__ #endif // __WXMAC__
#ifdef __UNIX__ #ifdef __UNIX__
// restore the old umask if we changed it // restore the old umask if we changed it

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

@@ -11,7 +11,6 @@
#ifdef __GNUG__ #ifdef __GNUG__
// Note: this is done in utilscmn.cpp now. // Note: this is done in utilscmn.cpp now.
// #pragma implementation
// #pragma implementation "utils.h" // #pragma implementation "utils.h"
#endif #endif
@@ -130,11 +129,11 @@ long wxGetFreeMemory()
void wxUsleep(unsigned long milliseconds) void wxUsleep(unsigned long milliseconds)
{ {
clock_t start = clock() ; clock_t start = clock() ;
do do
{ {
YieldToAnyThread() ; YieldToAnyThread() ;
} while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
} }
void wxSleep(int nSecs) void wxSleep(int nSecs)
@@ -318,9 +317,9 @@ bool wxIsBusy()
return (wxBusyCursorCount > 0); return (wxBusyCursorCount > 0);
} }
wxString wxMacFindFolder( short vol, wxString wxMacFindFolder( short vol,
OSType folderType, OSType folderType,
Boolean createFolder) Boolean createFolder)
{ {
short vRefNum ; short vRefNum ;
long dirID ; long dirID ;
@@ -331,7 +330,7 @@ wxString wxMacFindFolder( short vol,
FSSpec file ; FSSpec file ;
if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr ) if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
{ {
strDir = wxMacFSSpec2MacFilename( &file ) + ":" ; strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
} }
} }
return strDir ; return strDir ;
@@ -343,7 +342,6 @@ char *wxGetUserHome (const wxString& user)
// TODO // TODO
return NULL; return NULL;
} }
#endif
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
@@ -378,6 +376,7 @@ 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.

21
src/mac/utils.cpp
View File

@@ -11,7 +11,6 @@
#ifdef __GNUG__ #ifdef __GNUG__
// Note: this is done in utilscmn.cpp now. // Note: this is done in utilscmn.cpp now.
// #pragma implementation
// #pragma implementation "utils.h" // #pragma implementation "utils.h"
#endif #endif
@@ -130,11 +129,11 @@ long wxGetFreeMemory()
void wxUsleep(unsigned long milliseconds) void wxUsleep(unsigned long milliseconds)
{ {
clock_t start = clock() ; clock_t start = clock() ;
do do
{ {
YieldToAnyThread() ; YieldToAnyThread() ;
} while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
} }
void wxSleep(int nSecs) void wxSleep(int nSecs)
@@ -318,9 +317,9 @@ bool wxIsBusy()
return (wxBusyCursorCount > 0); return (wxBusyCursorCount > 0);
} }
wxString wxMacFindFolder( short vol, wxString wxMacFindFolder( short vol,
OSType folderType, OSType folderType,
Boolean createFolder) Boolean createFolder)
{ {
short vRefNum ; short vRefNum ;
long dirID ; long dirID ;
@@ -331,7 +330,7 @@ wxString wxMacFindFolder( short vol,
FSSpec file ; FSSpec file ;
if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr ) if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
{ {
strDir = wxMacFSSpec2MacFilename( &file ) + ":" ; strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
} }
} }
return strDir ; return strDir ;
@@ -343,7 +342,6 @@ char *wxGetUserHome (const wxString& user)
// TODO // TODO
return NULL; return NULL;
} }
#endif
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
@@ -378,6 +376,7 @@ 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.

2
src/unix/utilsunx.cpp
View File

@@ -1011,7 +1011,6 @@ long wxGetFreeMemory()
return -1; return -1;
} }
#ifndef __WXMAC__
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{ {
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
@@ -1041,7 +1040,6 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
return FALSE; return FALSE;
} }
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// env vars // env vars