Move unused values into 2.4 compatibility. Source cleaning.

[wxWidgets.git] / include / wx / msw / mslu.h

diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h
index f09435b5fbd61f5732e533958051fd89986c36a9..348ef3e8a45ec1c8c64d791a8a91aa3e3a343f38 100644 (file)
--- a/include/wx/msw/mslu.h
+++ b/include/wx/msw/mslu.h
@@ -16,35 +16,31 @@
 #include "wx/utils.h"
 #include "wx/wxchar.h"
 
-#if !wxUSE_UNICODE_MSLU
-inline bool wxUsingUnicowsDll() { return FALSE; }
-#else
-
 // Returns true if we are running under Unicode emulation in Win9x environment.
 // Workaround hacks take effect only if this condition is met
-inline bool wxUsingUnicowsDll()
-{
-    return (wxGetOsVersion() == wxWIN95);
-}
+// (NB: this function is needed even if !wxUSE_UNICODE_MSLU)
+WXDLLIMPEXP_BASE bool wxUsingUnicowsDll();
 
 //------------------------------------------------------------------------
 // Wrongly implemented functions from unicows.dll
 //------------------------------------------------------------------------
 
+#if wxUSE_UNICODE_MSLU
+
 #if wxUSE_GUI
 
-WXDLLEXPORT bool wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc, 
-                                   WXLPARAM lData, WXWPARAM wData, 
-                                   int x, int y, int cx, int cy, 
-                                   unsigned int flags);
+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);
 #define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
                       ld, wd, x, y, cx, cy, flags)
 
-WXDLLEXPORT bool wxMSLU_GetOpenFileNameW(void *ofn);
+WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn);
 #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn)
 
-WXDLLEXPORT bool wxMSLU_GetSaveFileNameW(void *ofn);
+WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
 
 #endif
@@ -53,17 +49,19 @@ WXDLLEXPORT bool wxMSLU_GetSaveFileNameW(void *ofn);
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
-WXDLLEXPORT int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
-WXDLLEXPORT int wxMSLU__tremove(const wxChar *name);
+WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
+WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name);
 
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
-WXDLLEXPORT int wxMSLU__wopen(const wxChar *name, int flags, int mode);
-WXDLLEXPORT int wxMSLU__waccess(const wxChar *name, int mode);
-WXDLLEXPORT int wxMSLU__wmkdir(const wxChar *name);
-WXDLLEXPORT int wxMSLU__wrmdir(const wxChar *name);
-WXDLLEXPORT int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
+    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
+WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode);
+WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode);
+WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
+WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
+WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer);
 #endif
 
 #endif // wxUSE_UNICODE_MSLU