X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f410f2278c9833187636b3e47b5797e80c934f..10793ebfbb49d48e6a97f8e2d02081f458bd80b4:/src/msw/mslu.cpp?ds=sidebyside diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp index cdd08914c8..a484b58656 100644 --- a/src/msw/mslu.cpp +++ b/src/msw/mslu.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,9 +19,26 @@ #ifndef WX_PRECOMP #include "wx/defs.h" + #include "wx/utils.h" #endif //------------------------------------------------------------------------ +// Check for use of MSLU +//------------------------------------------------------------------------ + +#if wxUSE_BASE + +bool WXDLLIMPEXP_BASE wxUsingUnicowsDll() +{ +#if wxUSE_UNICODE_MSLU + return (wxGetOsVersion() == wxWIN95); +#else + return false; +#endif +} + +#endif // wxUSE_BASE + #if wxUSE_UNICODE_MSLU @@ -152,6 +165,14 @@ WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name) return _tremove(name); } +WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode) +{ + if ( wxUsingUnicowsDll() ) + return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode)); + else + return _tfopen(name,mode); +} + #if defined( __VISUALC__ ) \ || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) ) \ @@ -201,6 +222,17 @@ WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer) return _wstat(name, buffer); } +#ifdef __BORLANDC__ +//here _stati64 is defined as stati64, see msw/mslu.h line 62 +#undef _stati64 +WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer) + { + if ( wxUsingUnicowsDll() ) + return _stati64((const char*)wxConvFile.cWX2MB(name), (stati64 *) buffer); + else + return _wstati64(name, (stati64 *) buffer); +} +#else WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer) { if ( wxUsingUnicowsDll() ) @@ -208,6 +240,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffe else return _wstati64(name, buffer); } +#endif //__BORLANDC__ #endif // compilers having wopen() &c