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

corrected wxMacFSSpec2MacFilename and wxMacFilename2FSSpec to convert to/from

Browse Source 
Unix style paths under Mac OS X (when compiled with the Apple DevTools)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-29 20:20:46 +00:00
parent 7f35402d14
commit 334d244877
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/filefn.cpp
View File

@@ -143,11 +143,7 @@ const off_t wxInvalidOffset = (off_t)-1;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// we need to translate Mac filenames before passing them to OS functions // we need to translate Mac filenames before passing them to OS functions
#if defined(__WXMAC__) && defined(__DARWIN__) #define OS_FILENAME(s) (s.fn_str())
#define OS_FILENAME(s) wxMac2UnixFilename(s.fn_str())
#else
#define OS_FILENAME(s) (s.fn_str())
#endif
// ============================================================================ // ============================================================================
// implementation // implementation
@@ -846,7 +842,11 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
if ( length > 0 && (*myPath)[length-1] ==':' ) if ( length > 0 && (*myPath)[length-1] ==':' )
(*myPath)[length-1] = 0 ; (*myPath)[length-1] = 0 ;
wxString result( (char*) *myPath ) ; #ifdef __DARWIN__
wxString result( wxMac2UnixFilename((char*) *myPath) ) ;
#else
wxString result( (char*) *myPath ) ;
#endif
::HUnlock( myPath ) ; ::HUnlock( myPath ) ;
::DisposeHandle( myPath ) ; ::DisposeHandle( myPath ) ;
return result ; return result ;
@@ -854,7 +854,12 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) 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 ] ; static char sMacFileNameConversion[ 1000 ] ;