fixes for new lib dirs for wxMSW

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

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index be480f683f11173153532b37b5e474a165bb2755..eb7866d90c78e9a11d83791988eb550b5112e1aa 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
 


@@ -18,6 +18,7 @@
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

+#include <dir.h>

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP


@@ -130,6 +131,8 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 

+#if wxUSE_BASE
+

 WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
 {
     if ( wxUsingUnicowsDll() )
 WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname)
 {
     if ( wxUsingUnicowsDll() )


@@ -148,12 +151,17 @@ WXDLLEXPORT int wxMSLU__tremove(const wxChar *name)
 
 #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)
 {
     if ( wxUsingUnicowsDll() )
 
 WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode)
 {
     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);
 }


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

-#endif
+#endif // compilers having wopen() &c
+
+#endif // wxUSE_BASE

 
 #endif // wxUSE_UNICODE_MSLU
 
 #endif // wxUSE_UNICODE_MSLU