X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e168b6acfd9fc39c0b8015a5dcce57a502a0640d..a61d25e6394cb952ce59bbfbc68db72a07069dd9:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index c8b6040148..4bbe6747d1 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1445,6 +1445,14 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) delete [] cbuf; } #endif + +#ifdef __DJGPP__ + // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths with + // / deliminers. We don't like that. + for (wxChar *ch = buf; *ch; ch++) + if (*ch == wxT('/')) *ch = wxT('\\'); +#endif + return buf; } @@ -1756,3 +1764,28 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) #ifdef __VISUALC__ #pragma warning(default:4706) // assignment within conditional expression #endif // VC++ + +//------------------------------------------------------------------------ +// Missing functions in Unicode for Win9x +//------------------------------------------------------------------------ + +// NB: MSLU only covers Win32 API, it doesn't provide Unicode implementation of +// libc functions. Unfortunately, some of MSVCRT wchar_t functions +// (e.g. _wopen) don't work on Windows 9x, so we have to workaround it +// by calling the char version. We still want to use wchar_t version on +// NT/2000/XP, though, because they allow for Unicode file names. +#if wxUSE_UNICODE_MSLU + + #if defined( __VISUALC__ ) \ + || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ + || ( defined(__MWERKS__) && defined(__WXMSW__) ) + WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode) + { + if ( wxGetOsVersion() == wxWINDOWS_NT ) + return _wopen(name, flags, mode); + else + return _open(wxConvFile.cWX2MB(name), flags, mode); + } + #endif + +#endif // wxUSE_UNICODE_MSLU