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
WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
#define Unix2DosFilename wxUnix2DosFilename
WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
#define Unix2DosFilename wxUnix2DosFilename
-#if defined(__WXMAC__)
- WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
- WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
- WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
- WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
- WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
- WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
+#ifdef __WXMAC__
+WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
+WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
+WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
+WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
#endif
// Strip the extension, in situ
#endif
// Strip the extension, in situ
bool
wxIsAbsolutePath (const wxString& filename)
{
bool
wxIsAbsolutePath (const wxString& filename)
{
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
// "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
// is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
// This seems wrong to me, but there is no fix. since
// "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
// is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
return TRUE ;
if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
return TRUE ;
- if (filename != wxT(""))
- {
- if (filename[0] == wxT('/')
+ // Unix like or Windows
+ if (filename[0] == wxT('/'))
+ return TRUE;
+#endif
- || (filename[0] == wxT('[') && filename[1] != wxT('.'))
+ if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
+ return TRUE;
#endif
#ifdef __WINDOWS__
#endif
#ifdef __WINDOWS__
- /* MSDOS */
- || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
+ // MSDOS like
+ if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
+ return TRUE;
// (basename)
wxChar *wxFileNameFromPath (wxChar *path)
{
// (basename)
wxChar *wxFileNameFromPath (wxChar *path)
{
- register wxChar *tcp;
-
- tcp = path + wxStrlen (path);
- while (--tcp >= path)
+ register wxChar *tcp;
+
+ tcp = path + wxStrlen (path);
+ while (--tcp >= path)
-#ifdef __WXMAC__
- if (*tcp == wxT(':') )
-#else
- if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
- || *tcp == wxT(':') || *tcp == wxT(']'))
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+ // Classic or Carbon CodeWarrior like
+ // Carbon with Apple DevTools is Unix like
+ if (*tcp == wxT(':'))
+ return tcp + 1;
+ // Unix like or Windows
+ if (*tcp == wxT('/') || *tcp == wxT('\\'))
+ return tcp + 1;
+#ifdef __VMS__
+ if (*tcp == wxT(':') || *tcp == wxT(']'))
+ return tcp + 1;
- return tcp + 1;
- } /* while */
#if defined(__WXMSW__) || defined(__WXPM__)
#if defined(__WXMSW__) || defined(__WXPM__)
- if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
- return path + 2;
+ // MSDOS like
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+ return path + 2;
}
wxString wxFileNameFromPath (const wxString& path1)
{
}
wxString wxFileNameFromPath (const wxString& path1)
{
- if (path1 != wxT(""))
- {
-
- wxChar *path = WXSTRINGCAST path1 ;
- register wxChar *tcp;
-
- tcp = path + wxStrlen (path);
- while (--tcp >= path)
- {
-#ifdef __WXMAC__
- if (*tcp == wxT(':') )
-#else
- if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
- || *tcp == wxT(':') || *tcp == wxT(']'))
+ if (path1 != wxT(""))
+ {
+ wxChar *path = WXSTRINGCAST path1 ;
+ register wxChar *tcp;
+
+ tcp = path + wxStrlen (path);
+ while (--tcp >= path)
+ {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+ // Classic or Carbon CodeWarrior like
+ // Carbon with Apple DevTools is Unix like
+ if (*tcp == wxT(':') )
+ return wxString(tcp + 1);
+ // Unix like or Windows
+ if (*tcp == wxT('/') || *tcp == wxT('\\'))
+ return wxString(tcp + 1);
+#ifdef __VMS__
+ if (*tcp == wxT(':') || *tcp == wxT(']'))
return wxString(tcp + 1);
return wxString(tcp + 1);
#if defined(__WXMSW__) || defined(__WXPM__)
#if defined(__WXMSW__) || defined(__WXPM__)
- if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+ // MSDOS like
+ if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
return wxString(path + 2);
#endif
}
return wxString(path + 2);
#endif
}
- // Yes, this should return the path, not an empty string, otherwise
- // we get "thing.txt" -> "".
- return path1;
+ // Yes, this should return the path, not an empty string, otherwise
+ // we get "thing.txt" -> "".
+ return path1;
}
// Return just the directory, or NULL if no directory
wxChar *
wxPathOnly (wxChar *path)
{
}
// Return just the directory, or NULL if no directory
wxChar *
wxPathOnly (wxChar *path)
{
- static wxChar buf[_MAXPATHLEN];
-
- // Local copy
- wxStrcpy (buf, path);
-
- int l = wxStrlen(path);
- bool done = FALSE;
-
- int i = l - 1;
-
- // Search backward for a backward or forward slash
- while (!done && i > -1)
- {
- // ] is for VMS
-#ifdef __WXMAC__
- if (path[i] == wxT(':') )
+ static wxChar buf[_MAXPATHLEN];
+
+ // Local copy
+ wxStrcpy (buf, path);
+
+ int l = wxStrlen(path);
+ int i = l - 1;
+
+ // Search backward for a backward or forward slash
+ while (i > -1)
+ {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+ // Classic or Carbon CodeWarrior like
+ // Carbon with Apple DevTools is Unix like
+ if (path[i] == wxT(':') )
+ {
+ buf[i] = 0;
+ return buf;
+ }
- if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+ // Unix like or Windows
+ if (path[i] == wxT('/') || path[i] == wxT('\\'))
+ {
+ buf[i] = 0;
+ return buf;
+ }
- if ( path[i] == wxT(']') )
- buf[i+1] = 0;
- else
+ if (path[i] == wxT(']'))
+ {
+ buf[i+1] = 0;
+ return buf;
+ }
- buf[i] = 0;
-
- return buf;
#if defined(__WXMSW__) || defined(__WXPM__)
#if defined(__WXMSW__) || defined(__WXPM__)
- // Try Drive specifier
- if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+ // Try Drive specifier
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
- // A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = wxT('.');
- buf[3] = wxT('\0');
- return buf;
+ // A:junk --> A:. (since A:.\junk Not A:\junk)
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
+ return buf;
-
- return (wxChar *) NULL;
+ return (wxChar *) NULL;
}
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
}
// Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path)
{
- wxChar buf[_MAXPATHLEN];
-
- // Local copy
- wxStrcpy (buf, WXSTRINGCAST path);
-
- int l = path.Length();
- bool done = FALSE;
-
- int i = l - 1;
-
- // Search backward for a backward or forward slash
- while (!done && i > -1)
- {
- // ] is for VMS
-#ifdef __WXMAC__
- if (path[i] == wxT(':') )
+ wxChar buf[_MAXPATHLEN];
+
+ // Local copy
+ wxStrcpy (buf, WXSTRINGCAST path);
+
+ int l = path.Length();
+ int i = l - 1;
+
+ // Search backward for a backward or forward slash
+ while (i > -1)
+ {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+ // Classic or Carbon CodeWarrior like
+ // Carbon with Apple DevTools is Unix like
+ if (path[i] == wxT(':') )
+ {
+ buf[i] = 0;
+ return wxString(buf);
+ }
- if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+ // Unix like or Windows
+ if (path[i] == wxT('/') || path[i] == wxT('\\'))
+ {
+ buf[i] = 0;
+ return wxString(buf);
+ }
- if ( path[i] == wxT(']') )
- buf[i+1] = 0;
- else
+ if (path[i] == wxT(']'))
+ {
+ buf[i+1] = 0;
+ return wxString(buf);
+ }
- buf[i] = 0;
-
- return wxString(buf);
#if defined(__WXMSW__) || defined(__WXPM__)
#if defined(__WXMSW__) || defined(__WXPM__)
- // Try Drive specifier
- if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+ // Try Drive specifier
+ if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
- // A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = wxT('.');
- buf[3] = wxT('\0');
- return wxString(buf);
+ // A:junk --> A:. (since A:.\junk Not A:\junk)
+ buf[2] = wxT('.');
+ buf[3] = wxT('\0');
+ return wxString(buf);
-
- return wxString(wxT(""));
+ return wxString(wxT(""));
}
// Utility for converting delimiters in DOS filenames to UNIX style
}
// Utility for converting delimiters in DOS filenames to UNIX style
wxMacFilename2FSSpec( var , spec ) ;
}
wxMacFilename2FSSpec( var , spec ) ;
}
void
wxDos2UnixFilename (char *s)
{
void
wxDos2UnixFilename (char *s)
{
// Get first file name matching given wild card.
// Get first file name matching given wild card.
+#if defined(__UNIX__) && !defined(__WXMAC__)
// Get first file name matching given wild card.
// Flags are reserved for future use.
// Get first file name matching given wild card.
// Flags are reserved for future use.
char *cbuf = new char[sz+1];
#ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) {
char *cbuf = new char[sz+1];
#ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) {
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
enum
{
SFSaveDisk = 0x214, CurDirStore = 0x398
enum
{
SFSaveDisk = 0x214, CurDirStore = 0x398
#else // wxUnicode
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
#else // wxUnicode
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
FSSpec cwdSpec ;
FCBPBRec pb;
OSErr error;
FSSpec cwdSpec ;
FCBPBRec pb;
OSErr error;