X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f410f2278c9833187636b3e47b5797e80c934f..63ab3daed955b52885e75daeab6088564f9e64d2:/src/msw/mslu.cpp?ds=sidebyside
diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index cdd08914c8..064b8744dc 100644
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: msw/mslu.cpp
+// Name: src/msw/mslu.cpp
// Purpose: Fixes for bugs in MSLU
// Author: Vaclav Slavik
// Modified by:
@@ -9,24 +9,36 @@
// 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"
#ifdef __BORLANDC__
-#pragma hdrstop
-#include
+ #pragma hdrstop
+ #include
#endif
#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() == wxOS_WINDOWS_9X);
+#else
+ return false;
+#endif
+}
+
+#endif // wxUSE_BASE
+
+
#if wxUSE_UNICODE_MSLU
//------------------------------------------------------------------------
@@ -53,7 +65,7 @@
#include
#endif
-// Undef redirection macros defined in wx/msw/mslu.h:
+// Undef redirection macros defined in wx/msw/wrapwin.h:
#undef DrawStateW
#undef GetOpenFileNameW
#undef GetSaveFileNameW
@@ -108,7 +120,7 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
}
}
-#endif
+#endif // OFN_EXPLORER
}
WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)
@@ -152,6 +164,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 +221,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 wx/filefn.h
+#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 +239,7 @@ WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffe
else
return _wstati64(name, buffer);
}
+#endif //__BORLANDC__
#endif // compilers having wopen() &c