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

corrections for path handling under Mac OS X

Browse Source 
Classic Mac paths (: separator) are used when compiled using CodeWarrior even
under Mac OS X; Unix like Mac paths (/ separator) are used when compiled using
the Apple Developer Tools


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-31 06:25:05 +00:00
parent d56e2b972f
commit e8e1d09e0e
2 changed files with 153 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/filefn.h
View File

@@ -168,7 +168,7 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
#define Unix2DosFilename wxUnix2DosFilename #define Unix2DosFilename wxUnix2DosFilename
#if defined(__WXMAC__) #ifdef __WXMAC__
WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ; WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ; WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ; WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;

154
src/common/filefn.cpp
View File

@@ -289,33 +289,33 @@ wxFileExists (const wxString& filename)
bool bool
wxIsAbsolutePath (const wxString& filename) wxIsAbsolutePath (const wxString& filename)
{ {
#ifdef __WXMAC__
if (filename != wxT("")) if (filename != wxT(""))
{ {
#if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
// This seems wrong to me, but there is no fix. since // This seems wrong to me, but there is no fix. since
// "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt" // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
// is not. Or maybe ":MyDir:MyText.txt" has to be used? RR. // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':') if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
return TRUE ; return TRUE ;
}
return FALSE ;
#else #else
if (filename != wxT("")) // Unix like or Windows
{ if (filename[0] == wxT('/'))
if (filename[0] == wxT('/') return TRUE;
#endif
#ifdef __VMS__ #ifdef __VMS__
|| (filename[0] == wxT('[') && filename[1] != wxT('.')) if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return TRUE;
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
/* MSDOS */ // MSDOS like
|| filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')) if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
#endif
)
return TRUE; return TRUE;
#endif
} }
return FALSE ; return FALSE ;
#endif
} }
/* /*
@@ -665,19 +665,23 @@ wxChar *wxFileNameFromPath (wxChar *path)
tcp = path + wxStrlen (path); tcp = path + wxStrlen (path);
while (--tcp >= path) while (--tcp >= path)
{ {
#ifdef __WXMAC__ #if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (*tcp == wxT(':')) if (*tcp == wxT(':'))
#else
if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
|| *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
#endif
return tcp + 1; return tcp + 1;
#else
// Unix like or Windows
if (*tcp == wxT('/') || *tcp == wxT('\\'))
return tcp + 1;
#endif
#ifdef __VMS__
if (*tcp == wxT(':') || *tcp == wxT(']'))
return tcp + 1;
#endif
} /* while */ } /* while */
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
// MSDOS like
if (wxIsalpha (*path) && *(path + 1) == wxT(':')) if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return path + 2; return path + 2;
#endif #endif
@@ -689,26 +693,29 @@ wxString wxFileNameFromPath (const wxString& path1)
{ {
if (path1 != wxT("")) if (path1 != wxT(""))
{ {
wxChar *path = WXSTRINGCAST path1 ; wxChar *path = WXSTRINGCAST path1 ;
register wxChar *tcp; register wxChar *tcp;
tcp = path + wxStrlen (path); tcp = path + wxStrlen (path);
while (--tcp >= path) while (--tcp >= path)
{ {
#ifdef __WXMAC__ #if defined(__WXMAC__) && !defined(__DARWIN__)
// Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (*tcp == wxT(':') ) if (*tcp == wxT(':') )
#else
if (*tcp == wxT('/') || *tcp == wxT('\\')
#ifdef __VMS__
|| *tcp == wxT(':') || *tcp == wxT(']'))
#else
)
#endif
#endif
return wxString(tcp + 1); return wxString(tcp + 1);
#else
// Unix like or Windows
if (*tcp == wxT('/') || *tcp == wxT('\\'))
return wxString(tcp + 1);
#endif
#ifdef __VMS__
if (*tcp == wxT(':') || *tcp == wxT(']'))
return wxString(tcp + 1);
#endif
} /* while */ } /* while */
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
// MSDOS like
if (wxIsalpha (*path) && *(path + 1) == wxT(':')) if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return wxString(path + 2); return wxString(path + 2);
#endif #endif
@@ -730,31 +737,35 @@ wxPathOnly (wxChar *path)
wxStrcpy (buf, path); wxStrcpy (buf, path);
int l = wxStrlen(path); int l = wxStrlen(path);
bool done = FALSE;
int i = l - 1; int i = l - 1;
// Search backward for a backward or forward slash // Search backward for a backward or forward slash
while (!done && i > -1) while (i > -1)
{ {
// ] is for VMS #if defined(__WXMAC__) && !defined(__DARWIN__)
#ifdef __WXMAC__ // Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (path[i] == wxT(':') ) if (path[i] == wxT(':') )
#else
if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
#endif
{ {
done = TRUE;
#ifdef __VMS__
if ( path[i] == wxT(']') )
buf[i+1] = 0;
else
#endif
buf[i] = 0; buf[i] = 0;
return buf; return buf;
} }
else i --; #else
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
buf[i] = 0;
return buf;
}
#endif
#ifdef __VMS__
if (path[i] == wxT(']'))
{
buf[i+1] = 0;
return buf;
}
#endif
i --;
} }
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
@@ -768,7 +779,6 @@ wxPathOnly (wxChar *path)
} }
#endif #endif
} }
return (wxChar *) NULL; return (wxChar *) NULL;
} }
@@ -783,31 +793,35 @@ wxString wxPathOnly (const wxString& path)
wxStrcpy (buf, WXSTRINGCAST path); wxStrcpy (buf, WXSTRINGCAST path);
int l = path.Length(); int l = path.Length();
bool done = FALSE;
int i = l - 1; int i = l - 1;
// Search backward for a backward or forward slash // Search backward for a backward or forward slash
while (!done && i > -1) while (i > -1)
{ {
// ] is for VMS #if defined(__WXMAC__) && !defined(__DARWIN__)
#ifdef __WXMAC__ // Classic or Carbon CodeWarrior like
// Carbon with Apple DevTools is Unix like
if (path[i] == wxT(':') ) if (path[i] == wxT(':') )
#else
if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
#endif
{ {
done = TRUE;
#ifdef __VMS__
if ( path[i] == wxT(']') )
buf[i+1] = 0;
else
#endif
buf[i] = 0; buf[i] = 0;
return wxString(buf); return wxString(buf);
} }
else i --; #else
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
buf[i] = 0;
return wxString(buf);
}
#endif
#ifdef __VMS__
if (path[i] == wxT(']'))
{
buf[i+1] = 0;
return wxString(buf);
}
#endif
i --;
} }
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
@@ -821,7 +835,6 @@ wxString wxPathOnly (const wxString& path)
} }
#endif #endif
} }
return wxString(wxT("")); return wxString(wxT(""));
} }
@@ -939,7 +952,8 @@ void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
wxMacFilename2FSSpec( var , spec ) ; wxMacFilename2FSSpec( var , spec ) ;
} }
#endif #endif // __WXMAC__
void void
wxDos2UnixFilename (char *s) wxDos2UnixFilename (char *s)
{ {
@@ -1283,7 +1297,7 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
// Get first file name matching given wild card. // Get first file name matching given wild card.
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__WXMAC__)
// Get first file name matching given wild card. // Get first file name matching given wild card.
// Flags are reserved for future use. // Flags are reserved for future use.
@@ -1717,7 +1731,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__) #elif defined(__WXMAC__) && !defined(__DARWIN__)
enum enum
{ {
SFSaveDisk = 0x214, CurDirStore = 0x398 SFSaveDisk = 0x214, CurDirStore = 0x398
@@ -1735,7 +1749,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
#else // wxUnicode #else // wxUnicode
#ifdef _MSC_VER #ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) { if (_getcwd(buf, sz) == NULL) {
#elif defined(__WXMAC__) && !defined(__UNIX__) #elif defined(__WXMAC__) && !defined(__DARWIN__)
FSSpec cwdSpec ; FSSpec cwdSpec ;
FCBPBRec pb; FCBPBRec pb;
OSErr error; OSErr error;