removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h
index 50d33b92bc784120b1d9aa8879543d6d3df6d025..a8ce885e11b25998c73aa2f7d74a9e1f56ee248f 100644 (file)
--- a/include/wx/msw/mslu.h
+++ b/include/wx/msw/mslu.h
@@ -16,26 +16,22 @@
 #include "wx/utils.h"
 #include "wx/wxchar.h"
 
 #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
 // 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
 //------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------
 // Wrongly implemented functions from unicows.dll
 //------------------------------------------------------------------------
 

+#if wxUSE_UNICODE_MSLU
+

 #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);
 #define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
                                   unsigned int flags);
 #define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \


@@ -55,16 +51,25 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 
 WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
 WXDLLIMPEXP_BASE 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);

+WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name, const wxChar *mode);

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

-    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
+    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
+    || defined(__DMC__)
+
+#ifdef __BORLANDC__
+    // BCC has _stati64() function but struct stati64
+    #define _stati64 stati64
+#endif
+

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