fix for [ 950550 ] wxChoice - wxEmptyString (wxChoice::FindString doesn't work with...

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

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 019346167b6500abf59c765eca8c4877e734e711..eba45e13d7a619a1e3f843430da573047fa6a47a 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -23,8 +23,27 @@
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"

+    #include "wx/utils.h"

 #endif
 
 #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
 
 //------------------------------------------------------------------------
 #if wxUSE_UNICODE_MSLU
 
 //------------------------------------------------------------------------


@@ -131,9 +150,10 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 

-#ifdef __WXBASE__
+#if wxUSE_BASE

 
 

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

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


@@ -141,7 +161,7 @@ WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
         return _trename(oldname, newname);
 }
 
         return _trename(oldname, newname);
 }
 

-WXDLLEXPORT int wxMSLU__tremove(const wxChar *name)
+WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)

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


@@ -154,7 +174,7 @@ WXDLLEXPORT int wxMSLU__tremove(const wxChar *name)
     || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
     || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
 
     || ( 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 wxChar *name, int flags, int mode)

 {
     if ( wxUsingUnicowsDll() )
 #ifdef __BORLANDC__
 {
     if ( wxUsingUnicowsDll() )
 #ifdef __BORLANDC__


@@ -166,7 +186,7 @@ WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode)
         return _wopen(name, flags, mode);
 }
 
         return _wopen(name, flags, mode);
 }
 

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

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


@@ -174,7 +194,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 wxChar *name)

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


@@ -182,7 +202,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 wxChar *name)

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


@@ -190,7 +210,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 wxChar *name, struct _stat *buffer)

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


@@ -198,8 +218,16 @@ WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
         return _wstat(name, buffer);
 }
 
         return _wstat(name, buffer);
 }
 

+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer)
+{
+    if ( wxUsingUnicowsDll() )
+        return _stati64((const char*)wxConvFile.cWX2MB(name), buffer);
+    else
+        return _wstati64(name, buffer);
+}
+

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

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU