rename g_openDialogs to wxOpenModalDialogsCount and define it in toplevel.cpp to...

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

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 1fa85b050bb8c893674683e1c7787909b09d2d6a..65ab5f9630b3bc528f809ec6d4009c0a9be61278 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:


@@ -9,20 +9,35 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

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

 #endif
 
 #ifndef WX_PRECOMP
 #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

+}
+
+#endif // wxUSE_BASE
+

 
 #if wxUSE_UNICODE_MSLU
 
 
 #if wxUSE_UNICODE_MSLU
 


@@ -34,7 +49,7 @@
 //     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.
 //
 //     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.
 //

-//     Moreover, there are bugs in unicows.dll, of course. We have to 
+//     Moreover, there are bugs in unicows.dll, of course. We have to

 //     workaround them, too.
 //
 //------------------------------------------------------------------------
 //     workaround them, too.
 //
 //------------------------------------------------------------------------


@@ -44,17 +59,13 @@
 
 #include <stdio.h>
 #include <io.h>
 
 #include <stdio.h>
 #include <io.h>

-
-#ifdef __GNUWIN32__
-    #include <wchar.h>
-    #include <sys/stat.h>
-#endif
+#include <sys/stat.h>

 
 #ifdef __VISUALC__
     #include <direct.h>
 #endif
 
 
 #ifdef __VISUALC__
     #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


@@ -65,25 +76,25 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-WXDLLEXPORT int  wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, 
-                                   WXLPARAM lData, WXWPARAM wData, 
-                                   int x, int y, int cx, int cy, 
+WXDLLEXPORT int  wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
+                                   WXLPARAM lData, WXWPARAM wData,
+                                   int x, int y, int cx, int cy,

                                    unsigned int flags)
 {
     // VS: There's yet another bug in MSLU: DrawStateW behaves like if it was
                                    unsigned int flags)
 {
     // VS: There's yet another bug in MSLU: DrawStateW behaves like if it was

-    //     expecting char*, not wchar_t* input. We have to use DrawStateA 
+    //     expecting char*, not wchar_t* input. We have to use DrawStateA

     //     explicitly.
 
     if ( wxUsingUnicowsDll() )
     {
     //     explicitly.
 
     if ( wxUsingUnicowsDll() )
     {

-               return DrawStateA((HDC)dc, (HBRUSH)br, (DRAWSTATEPROC)outputFunc,
+        return DrawStateA((HDC)dc, (HBRUSH)br, (DRAWSTATEPROC)outputFunc,

                           (LPARAM)(const char*)
                                 wxConvLocal.cWX2MB((const wxChar*)lData),
                           wData, x, y, cx, cy, flags);
     }
     else
     {
                           (LPARAM)(const char*)
                                 wxConvLocal.cWX2MB((const wxChar*)lData),
                           wData, x, y, cx, cy, flags);
     }
     else
     {

-        return DrawStateW((HDC)dc, (HBRUSH)br, (DRAWSTATEPROC)outputFunc, 
+        return DrawStateW((HDC)dc, (HBRUSH)br, (DRAWSTATEPROC)outputFunc,

                           lData, wData, x, y, cx, cy, flags);
     }
 }
                           lData, wData, x, y, cx, cy, flags);
     }
 }


@@ -91,10 +102,10 @@ WXDLLEXPORT int  wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
 static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
 {
 #ifdef OFN_EXPLORER
 static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
 {
 #ifdef OFN_EXPLORER

-    // VS: there's a bug in unicows.dll - when multiple files are selected, 
-    //     of.nFileOffset doesn't point to the first filename but rather to 
+    // VS: there's a bug in unicows.dll - when multiple files are selected,
+    //     of.nFileOffset doesn't point to the first filename but rather to

     //     the last component of directory name. This bug is known to MSLU
     //     the last component of directory name. This bug is known to MSLU

-    //     developers, but they are not going to fix it: "this is a true 
+    //     developers, but they are not going to fix it: "this is a true

     //     limitation, that we have decided to live with" and "working
     //     harder on this case just did not seem worth the effort"...
     //
     //     limitation, that we have decided to live with" and "working
     //     harder on this case just did not seem worth the effort"...
     //


@@ -109,7 +120,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)


@@ -134,35 +145,61 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 

-WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
+#if wxUSE_BASE
+
+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);

 }
 
 }
 

-WXDLLEXPORT 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__wfopen(const wchar_t *name,const wchar_t* mode)
+{
+    if ( wxUsingUnicowsDll() )
+        return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
+    else
+        return _wfopen(name,mode);
+}
+
+WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name,
+                                        const wchar_t* mode,
+                                        FILE *stream)
+{
+    if ( wxUsingUnicowsDll() )
+        return freopen(wxConvFile.cWX2MB(name), wxConvFile.cWX2MB(mode), stream);
+    else
+        return _wfreopen(name, mode, stream);

 }
 
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
 }
 
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \

-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )

 
 

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

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

+#ifdef __BORLANDC__
+        return open(wxConvFile.cWX2MB(name), flags, mode);
+#else

         return _open(wxConvFile.cWX2MB(name), flags, mode);
         return _open(wxConvFile.cWX2MB(name), flags, mode);

+#endif

     else
         return _wopen(name, flags, mode);
 }
 
     else
         return _wopen(name, flags, mode);
 }
 

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

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


@@ -170,7 +207,7 @@ WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode)
         return _waccess(name, mode);
 }
 
         return _waccess(name, mode);
 }
 

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

 {
     if ( wxUsingUnicowsDll() )
         return _mkdir(wxConvFile.cWX2MB(name));
 {
     if ( wxUsingUnicowsDll() )
         return _mkdir(wxConvFile.cWX2MB(name));


@@ -178,7 +215,7 @@ WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name)
         return _wmkdir(name);
 }
 
         return _wmkdir(name);
 }
 

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

 {
     if ( wxUsingUnicowsDll() )
         return _rmdir(wxConvFile.cWX2MB(name));
 {
     if ( wxUsingUnicowsDll() )
         return _rmdir(wxConvFile.cWX2MB(name));


@@ -186,7 +223,7 @@ WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name)
         return _wrmdir(name);
 }
 
         return _wrmdir(name);
 }
 

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

 {
     if ( wxUsingUnicowsDll() )
         return _stat((const char*)wxConvFile.cWX2MB(name), buffer);
 {
     if ( wxUsingUnicowsDll() )
         return _stat((const char*)wxConvFile.cWX2MB(name), buffer);


@@ -194,6 +231,28 @@ WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
         return _wstat(name, buffer);
 }
 
         return _wstat(name, buffer);
 }
 

-#endif
+#ifdef __BORLANDC__
+//here _stati64 is defined as stati64, see wx/filefn.h
+#undef _stati64
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wchar_t *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 wchar_t *name, struct _stati64 *buffer)
+{
+    if ( wxUsingUnicowsDll() )
+        return _stati64((const char*)wxConvFile.cWX2MB(name), buffer);
+    else
+        return _wstati64(name, buffer);
+}
+#endif //__BORLANDC__
+
+#endif // compilers having wopen() &c
+
+#endif // wxUSE_BASE

 
 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU