From e0d81eac87b51ff88b858f606cde8cbfe1c6b474 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 22 Nov 2007 13:59:24 +0000 Subject: [PATCH] cleanup mac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/file.cpp | 6 ------ src/common/filename.cpp | 11 +---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/common/file.cpp b/src/common/file.cpp index 23e0450283..680f9dfb4e 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -198,16 +198,10 @@ bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode) { // if bOverwrite we create a new file or truncate the existing one, // otherwise we only create the new file and fail if it already exists -#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE - // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace - // int fd = open( fileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); - int fd = creat( fileName , accessMode); -#else int fd = wxOpen( fileName, O_BINARY | O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL) ACCESS(accessMode) ); -#endif if ( fd == -1 ) { wxLogSysError(_("can't create file '%s'"), fileName); diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 7846362846..8676863447 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -1102,14 +1102,7 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) size_t count = dirs.GetCount(); for ( size_t i = 0; i < count; i++ ) { - if ( i > 0 || -#if defined(__WXMAC__) && !defined(__DARWIN__) - // relative pathnames are exactely the other way round under mac... - !filename.IsAbsolute() -#else - filename.IsAbsolute() -#endif - ) + if ( i > 0 || filename.IsAbsolute() ) currPath += wxFILE_SEP_PATH; currPath += dirs[i]; @@ -1954,8 +1947,6 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) { #if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__) format = wxPATH_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - format = wxPATH_MAC; #elif defined(__VMS) format = wxPATH_VMS; #else -- 2.45.2