#include "wx/crt.h"
#endif
+#include "wx/dynarray.h"
#include "wx/file.h"
#include "wx/filename.h"
#include "wx/dir.h"
#endif
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
+ #include "wx/osx/private.h" // includes mac headers
#endif
#ifdef __WINDOWS__
#define _MAXPATHLEN 1024
#endif
-#ifdef __WXMAC__
-# include "MoreFilesX.h"
-#endif
-
// ----------------------------------------------------------------------------
// private globals
// ----------------------------------------------------------------------------
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// we must use GetFileAttributes() instead of the ANSI C functions because
// it can cope with network (UNC) paths unlike them
- DWORD ret = ::GetFileAttributes(filename);
+ DWORD ret = ::GetFileAttributes(filename.fn_str());
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__
{
if (!filename.empty())
{
-#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.
- if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
- return true ;
-#else
// Unix like or Windows
if (filename[0] == wxT('/'))
return true;
-#endif
#ifdef __VMS__
if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return true;
template<typename CharType>
static CharType *wxDoRealPath (CharType *path)
{
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- static const CharType SEP = wxT('\\');
wxUnix2DosFilename(path);
-#else
- static const CharType SEP = wxT('/');
#endif
if (path[0] && path[1]) {
/* MATTHEW: special case "/./x" */
trimchars[2] = wxT('\t');
trimchars[3] = 0;
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- const CharType SEP = wxT('\\');
-#else
- const CharType SEP = wxT('/');
+ //wxUnix2DosFilename(path);
#endif
+
buf[0] = wxT('\0');
if (name.empty())
return buf;
- nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+ nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
CharType *nm_tmp = nm;
/* Skip leading whitespace and cr */
// 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;
- }
-#else
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
buf[i] = 0;
return buf;
}
-#endif
#ifdef __VMS__
if (path[i] == wxT(']'))
{
// 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);
- }
-#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(']'))
{
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
-#if defined(__WXMAC__)
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
-#if TARGET_API_MAC_OSX
#define kDefaultPathStyle kCFURLPOSIXPathStyle
-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif
wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
{
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
CFRelease( cfString );
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
- return wxMacCFStringHolder(cfMutableString).AsString();
+ return wxCFStringRef(cfMutableString).AsString();
}
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
{
OSStatus err = noErr ;
- CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));
CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
CFRelease( cfMutableString );
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
CFRelease( cfname );
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
- return wxMacCFStringHolder(cfMutableString).AsString() ;
+ return wxCFStringRef(cfMutableString).AsString() ;
}
#ifndef __LP64__
void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
{
- OSStatus err = noErr ;
- FSRef fsRef ;
- wxMacPathToFSRef( path , &fsRef ) ;
- err = FSRefMakeFSSpec( &fsRef , spec ) ;
+ OSStatus err = noErr;
+ FSRef fsRef;
+ wxMacPathToFSRef( path , &fsRef );
+ err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+ verify_noerr( err );
}
#endif
// instead of our code if available
//
// NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
- if ( !::CopyFile(file1, file2, !overwrite) )
+ if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )
{
wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
file1.c_str(), file2.c_str());
|| (defined(__MWERKS__) && defined(__MSL__))
int res = wxRemove(file);
#elif defined(__WXMAC__)
- int res = unlink(wxFNCONV(file));
+ int res = unlink(file.fn_str());
#elif defined(__WXPALMOS__)
int res = 1;
// TODO with VFSFileDelete()
#if defined(__WXPALMOS__)
return false;
#elif defined(__WXMAC__) && !defined(__UNIX__)
- return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+ return (mkdir(dir.fn_str() , 0 ) == 0);
#else // !Mac
const wxChar *dirname = dir.c_str();
return false;
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// stat() can't cope with network paths
- DWORD ret = ::GetFileAttributes(strPath);
+ DWORD ret = ::GetFileAttributes(strPath.fn_str());
return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
#elif defined(__OS2__)
return NULL;
if ( buf )
+#ifdef _PACC_VER
+ // work around the PalmOS pacc compiler bug
+ wxStrcpy(buf, filename.data());
+#else
wxStrcpy(buf, filename);
+#endif
else
buf = MYcopystring(filename);
if ( !wxEndsWithPathSeparator(gs_dirPath ) )
gs_dirPath << wxFILE_SEP_PATH;
- if (gs_dir)
- delete gs_dir;
+ delete gs_dir; // can be NULL, this is ok
gs_dir = new wxDir(gs_dirPath);
if ( !gs_dir->IsOpened() )
wxString wxFindNextFile()
{
- wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );
+ wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );
wxString result;
gs_dir->GetNext(&result);
{
#if defined(_MSC_VER) || defined(__MINGW32__)
ok = _getcwd(cbuf, sz) != NULL;
- #elif defined(__WXMAC__) && !defined(__DARWIN__)
- char lbuf[1024] ;
- if ( getcwd( lbuf , sizeof( lbuf ) ) )
- {
- wxString res( lbuf , *wxConvCurrent ) ;
- wxStrcpy( buf , res ) ;
- ok = true;
- }
- else
- ok = false ;
#elif defined(__OS2__)
APIRET rc;
ULONG ulDriveNum = 0;
ok = getcwd(cbuf, sz) != NULL;
#endif // platform
- #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+ #if wxUSE_UNICODE
// finally convert the result to Unicode if needed
wxConvFile.MB2WC(buf, cbuf, sz);
#endif // wxUSE_UNICODE
#if defined(__OS2__)
if (d[1] == ':')
{
- ::DosSetDefaultDisk(1 + wxToupper(d[0]) - _T('A'));
- // do not call DosSetCurrentDir when just changing drive,
- // since it requires e.g. "d:." instead of "d:"!
- if (d.length() == 2)
- return true;
+ ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+ // do not call DosSetCurrentDir when just changing drive,
+ // since it requires e.g. "d:." instead of "d:"!
+ if (d.length() == 2)
+ return true;
}
return (::DosSetCurrentDir(d.c_str()) == 0);
#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
wxUnusedVar(d);
return false;
#else
- return (bool)(SetCurrentDirectory(d) != 0);
+ return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
#endif
#else
// Must change drive, too.
wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
return wxMacFindFolder(kOnSystemDisk, 'macs', false);
#else
return wxEmptyString;
return false;
}
-void WXDLLEXPORT wxSplitPath(const wxString& fileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
wxString *pstrPath,
wxString *pstrName,
wxString *pstrExt)
#if wxUSE_DATETIME
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
{
wxDateTime mtime;
if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
// Returns 0 if none or if there's a problem.
// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
-int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
wxArrayString& descriptions,
wxArrayString& filters)
{
HANDLE h = ::CreateFile
(
- path.wx_str(),
+ path.t_str(),
access,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
NULL,
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(path.fn_str(), W_OK) == 0;
+ return wxAccess(path.c_str(), W_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_WRITE);
#else
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(path.fn_str(), R_OK) == 0;
+ return wxAccess(path.c_str(), R_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_READ);
#else
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(path.fn_str(), X_OK) == 0;
+ return wxAccess(path.c_str(), X_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_EXECUTE);
#else
projects / wxWidgets.git / blobdiff