#endif // native Win compiler
#ifdef __GNUWIN32__
+ #include <wchar.h>
#ifndef __TWIN32__
#include <sys/unistd.h>
#endif
extern wxChar *wxBuffer;
-#if defined(__WXMAC__) && !defined(__UNIX__)
- #include "morefile.h"
- #include "moreextr.h"
- #include "fullpath.h"
- #include "fspcompa.h"
+#ifdef __WXMAC__
+# include "MoreFiles.h"
+# include "MoreFilesExtras.h"
+# include "FullPath.h"
+# include "FSpCompat.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
// ----------------------------------------------------------------------------
// we need to translate Mac filenames before passing them to OS functions
- #define OS_FILENAME(s) (s.fn_str())
+#define OS_FILENAME(s) (s.fn_str())
// ============================================================================
// implementation
bool
wxFileExists (const wxString& filename)
{
-#ifdef __GNUWIN32__ // (fix a B20 bug)
- return GetFileAttributes(filename) != 0xFFFFFFFF;
+#ifdef __WINDOWS__
+ // GetFileAttributes can copy with network paths
+ DWORD ret = GetFileAttributes(filename);
+ DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+ return ((ret != 0xffffffff) && (isDir == 0));
#else
wxStructStat stbuf;
if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
bool
wxIsAbsolutePath (const wxString& filename)
{
+#ifdef __WXMAC__
+ if (filename != wxT(""))
+ {
+ // 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 ;
+ }
+ return FALSE ;
+#else
if (filename != wxT(""))
{
if (filename[0] == wxT('/')
return TRUE;
}
return FALSE;
+#endif
}
/*
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
-#if defined(__WXMAC__) && !defined(__UNIX__)
+#if defined(__WXMAC__)
wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
{
Handle myPath ;
if ( length > 0 && (*myPath)[length-1] ==':' )
(*myPath)[length-1] = 0 ;
- wxString result( (char*) *myPath ) ;
+#ifdef __DARWIN__
+ wxString result( wxMac2UnixFilename((char*) *myPath) ) ;
+#else
+ wxString result( (char*) *myPath ) ;
+#endif
::HUnlock( myPath ) ;
::DisposeHandle( myPath ) ;
return result ;
void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
{
- FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+#ifdef __DARWIN__
+ const char *s = wxUnix2MacFilename(path);
+ FSpLocationFromFullPath( strlen(s) , s , spec ) ;
+#else
+ FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+#endif
}
-/*
static char sMacFileNameConversion[ 1000 ] ;
wxString wxMac2UnixFilename (const char *str)
return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
}
-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
-{
- FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
-}
-
void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
{
wxString var = wxUnix2MacFilename( path ) ;
wxMacFilename2FSSpec( var , spec ) ;
}
-*/
+
#endif
void
wxDos2UnixFilename (char *s)
bool
wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
// CopyFile() copies file attributes and modification time too, so use it
// instead of our code if available
//
// NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
return ::CopyFile(file1, file2, !overwrite) != 0;
+#elif defined(__WXPM__)
+ if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0)
+ return TRUE;
+ else
+ return FALSE;
#else // !Win32
wxStructStat fbuf;
bool wxRemoveFile(const wxString& file)
{
-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__GNUWIN32__)
int res = wxRemove(file);
#else
int res = unlink(OS_FILENAME(file));
// assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
// for the GNU compiler
-#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#elif defined(__WXPM__)
if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
#else // !MSW and !OS/2 VAC++
- (void)perm;
+ (void)perm;
if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif // !MSW/MSW
{
while ( wxEndsWithPathSeparator(strPath) )
{
size_t len = strPath.length();
- if ( len == 1 || strPath[len - 1] == _T(':') )
+ if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
break;
strPath.Truncate(len - 1);
}
#endif // __WINDOWS__
+#ifdef __WINDOWS__
+ // Stat can't cope with network paths
+ DWORD ret = GetFileAttributes(strPath.c_str());
+ DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+ return ((ret != 0xffffffff) && (isDir != 0));
+#else
+
wxStructStat st;
#ifndef __VISAGECPP__
return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
(st.st_mode == S_IFDIR);
#endif
+#endif
}
// Get a temporary filename, opening and closing the file.
wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#ifndef __WIN32__
wxChar tmp[144];
char *cbuf = new char[sz+1];
#ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) {
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+#elif defined(__WXMAC__)
enum
{
SFSaveDisk = 0x214, CurDirStore = 0x398
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
#elif defined(__WXMAC__) && !defined(__UNIX__)
- FSSpec cwdSpec ;
- FCBPBRec pb;
- OSErr error;
- Str255 fileName ;
- pb.ioNamePtr = (StringPtr) &fileName;
- pb.ioVRefNum = 0;
- pb.ioRefNum = LMGetCurApRefNum();
- pb.ioFCBIndx = 0;
- error = PBGetFCBInfoSync(&pb);
- if ( error == noErr )
- {
- cwdSpec.vRefNum = pb.ioFCBVRefNum;
- cwdSpec.parID = pb.ioFCBParID;
- cwdSpec.name[0] = 0 ;
- wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-
- strcpy( buf , res ) ;
- buf[res.length()-1]=0 ;
- }
- else
- buf[0] = 0 ;
- /*
- this version will not always give back the application directory on mac
- enum
- {
- SFSaveDisk = 0x214, CurDirStore = 0x398
- };
- FSSpec cwdSpec ;
-
- FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
- wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
- strcpy( buf , res ) ;
- */
- if (0) {
-#elif(__VISAGECPP__)
+ FSSpec cwdSpec ;
+ FCBPBRec pb;
+ OSErr error;
+ Str255 fileName ;
+ pb.ioNamePtr = (StringPtr) &fileName;
+ pb.ioVRefNum = 0;
+ pb.ioRefNum = LMGetCurApRefNum();
+ pb.ioFCBIndx = 0;
+ error = PBGetFCBInfoSync(&pb);
+ if ( error == noErr )
+ {
+ cwdSpec.vRefNum = pb.ioFCBVRefNum;
+ cwdSpec.parID = pb.ioFCBParID;
+ cwdSpec.name[0] = 0 ;
+ wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
+
+ strcpy( buf , res ) ;
+ buf[res.length()]=0 ;
+ }
+ else
+ buf[0] = 0 ;
+ /*
+ this version will not always give back the application directory on mac
+ enum
+ {
+ SFSaveDisk = 0x214, CurDirStore = 0x398
+ };
+ FSSpec cwdSpec ;
+
+ FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+ wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+ strcpy( buf , res ) ;
+ */
+ if (0) {
+#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
APIRET rc;
rc = ::DosQueryCurrentDir( 0 // current drive
,buf
// On non-Windows platform, probably just return the empty string.
wxString wxGetOSDirectory()
{
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
projects / wxWidgets.git / blobdiff