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

Quick fix up for __WXPM__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-11-11 04:39:48 +00:00
parent 3f2711d5c1
commit f28538c5f6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/filefn.cpp
View File

@@ -893,7 +893,7 @@ wxString wxUnix2MacFilename (const char *str)
return wxString (sMacFileNameConversion) ; return wxString (sMacFileNameConversion) ;
} }
wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
{ {
Handle myPath ; Handle myPath ;
short length ; short length ;
@@ -945,10 +945,10 @@ wxDos2UnixFilename (char *s)
} }
void void
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
wxUnix2DosFilename (char *s) wxUnix2DosFilename (char *s)
#else #else
wxUnix2DosFilename (char *WXUNUSED(s) ) wxUnix2DosFilename (char *WXUNUSED(s) )
#endif #endif
{ {
// Yes, I really mean this to happen under DOS only! JACS // Yes, I really mean this to happen under DOS only! JACS
@@ -1512,16 +1512,16 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
#ifdef _MSC_VER #ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) { if (_getcwd(cbuf, sz) == NULL) {
#elif defined( __WXMAC__) #elif defined( __WXMAC__)
enum enum
{ {
SFSaveDisk = 0x214, CurDirStore = 0x398 SFSaveDisk = 0x214, CurDirStore = 0x398
}; };
FSSpec cwdSpec ; FSSpec cwdSpec ;
FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
strcpy( buf , res ) ; strcpy( buf , res ) ;
if (0) if (0)
#else #else
if (getcwd(cbuf, sz) == NULL) { if (getcwd(cbuf, sz) == NULL) {
#endif #endif