Test using wxString::ToCDouble() in wxAny.

[wxWidgets.git] / src / msw / mslu.cpp

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index a484b586560f26d29979dc410812579e3f2fe1f4..ec882a9d986d5b11e0dbab49caf664efa08b561c 100644 (file)
--- 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:
 // Purpose:     Fixes for bugs in MSLU
 // Author:      Vaclav Slavik
 // Modified by:


@@ -13,15 +13,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#include <dir.h>
+    #pragma hdrstop
+    #include <dir.h>

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/utils.h"
 #endif
 
     #include "wx/utils.h"
 #endif
 

+#define wxHAS_HUGE_FILES
+

 //------------------------------------------------------------------------
 // Check for use of MSLU
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // Check for use of MSLU
 //------------------------------------------------------------------------


@@ -31,7 +32,7 @@
 bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
 {
 #if wxUSE_UNICODE_MSLU
 bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
 {
 #if wxUSE_UNICODE_MSLU

-    return (wxGetOsVersion() == wxWIN95);
+    return (wxGetOsVersion() == wxOS_WINDOWS_9X);

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -66,7 +67,7 @@ bool WXDLLIMPEXP_BASE wxUsingUnicowsDll()
     #include <direct.h>
 #endif
 
     #include <direct.h>
 #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
 #undef DrawStateW
 #undef GetOpenFileNameW
 #undef GetSaveFileNameW


@@ -121,7 +122,7 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
             ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
         }
     }
             ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
         }
     }

-#endif
+#endif // OFN_EXPLORER

 }
 
 WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)
 }
 
 WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn)


@@ -148,101 +149,80 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 

-WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname,
-                                     const wxChar *newname)
+WXDLLIMPEXP_BASE int wxMSLU__wrename(const wchar_t *oldname,
+                                     const wchar_t *newname)

 {
     if ( wxUsingUnicowsDll() )
         return rename(wxConvFile.cWX2MB(oldname), wxConvFile.cWX2MB(newname));
     else
 {
     if ( wxUsingUnicowsDll() )
         return rename(wxConvFile.cWX2MB(oldname), wxConvFile.cWX2MB(newname));
     else

-        return _trename(oldname, newname);
+        return _wrename(oldname, newname);

 }
 
 }
 

-WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wremove(const wchar_t *name)

 {
     if ( wxUsingUnicowsDll() )
         return remove(wxConvFile.cWX2MB(name));
     else
 {
     if ( wxUsingUnicowsDll() )
         return remove(wxConvFile.cWX2MB(name));
     else

-        return _tremove(name);
+        return _wremove(name);

 }
 
 }
 

-WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
+WXDLLIMPEXP_BASE FILE* wxMSLU__wfopen(const wchar_t *name,const wchar_t* mode)

 {
     if ( wxUsingUnicowsDll() )
         return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
     else
 {
     if ( wxUsingUnicowsDll() )
         return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
     else

-        return _tfopen(name,mode);
+        return _wfopen(name,mode);

 }
 
 }
 

-#if defined( __VISUALC__ ) \
-    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
-    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
-
-WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode)
+WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name,
+                                        const wchar_t* mode,
+                                        FILE *stream)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-#ifdef __BORLANDC__
-        return open(wxConvFile.cWX2MB(name), flags, mode);
-#else
-        return _open(wxConvFile.cWX2MB(name), flags, mode);
-#endif
+        return freopen(wxConvFile.cWX2MB(name), wxConvFile.cWX2MB(mode), stream);

     else
     else

-        return _wopen(name, flags, mode);
+        return _wfreopen(name, mode, stream);

 }
 
 }
 

-WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__wopen(const wchar_t *name, int flags, int mode)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-        return _access(wxConvFile.cWX2MB(name), mode);
+        return wxCRT_OpenA(wxConvFile.cWX2MB(name), flags, mode);

     else
     else

-        return _waccess(name, mode);
+        return wxCRT_OpenW(name, flags, mode);

 }
 
 }
 

-WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__waccess(const wchar_t *name, int mode)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-        return _mkdir(wxConvFile.cWX2MB(name));
+        return wxCRT_AccessA(wxConvFile.cWX2MB(name), mode);

     else
     else

-        return _wmkdir(name);
+        return wxCRT_AccessW(name, mode);

 }
 
 }
 

-WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wchar_t *name)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-        return _rmdir(wxConvFile.cWX2MB(name));
+        return wxCRT_MkDirA(wxConvFile.cWX2MB(name));

     else
     else

-        return _wrmdir(name);
+        return wxCRT_MkDirW(name);

 }
 
 }
 

-WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
+WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wchar_t *name)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-        return _stat((const char*)wxConvFile.cWX2MB(name), buffer);
+        return wxCRT_RmDirA(wxConvFile.cWX2MB(name));

     else
     else

-        return _wstat(name, buffer);
+        return wxCRT_RmDirW(name);

 }
 
 }
 

-#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)
+WXDLLIMPEXP_BASE int wxMSLU__wstat(const wchar_t *name, wxStructStat *buffer)

 {
     if ( wxUsingUnicowsDll() )
 {
     if ( wxUsingUnicowsDll() )

-        return _stati64((const char*)wxConvFile.cWX2MB(name), buffer);
+        return wxCRT_StatA((const char*)wxConvFile.cWX2MB(name), buffer);

     else
     else

-        return _wstati64(name, buffer);
+        return wxCRT_StatW(name, buffer);

 }
 }

-#endif //__BORLANDC__
-
-#endif // compilers having wopen() &c

 
 #endif // wxUSE_BASE
 
 
 #endif // wxUSE_BASE