X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6294ac2e91af3408cfa04910b90ad7ace94f1220..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/msw/mslu.h?ds=inline

diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h
index 1cdc0b3337..5bf78e82c0 100644
--- a/include/wx/msw/mslu.h
+++ b/include/wx/msw/mslu.h
@@ -1,8 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/mslu.h
-// Purpose:     Fixes for bugs in MSLU
+// Purpose:     MSLU-related declarations
 // Author:      Vaclav Slavik
-// Modified by:
+// Modified by: Vadim Zeitlin to move out various functions to other files
+//              to fix header inter-dependencies
 // Created:     2002/02/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vaclav Slavik
@@ -13,61 +14,10 @@
 #define _WX_MSLU_H_
 
 #include "wx/defs.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
-inline bool wxUsingUnicowsDll()
-{
-    return (wxGetOsVersion() == wxWIN95);
-}
-
-//------------------------------------------------------------------------
-// Wrongly implemented functions from unicows.dll
-//------------------------------------------------------------------------
-
-#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,
-                                  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 int wxMSLU_GetOpenFileNameW(void *ofn);
-#define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn)
-
-WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
-#define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
-
-#endif
-
-//------------------------------------------------------------------------
-// Missing libc file manipulation functions in Win9x
-//------------------------------------------------------------------------
-
-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__) ) \
-    || ( 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
+// (NB: this function is needed even if !wxUSE_UNICODE_MSLU)
+WXDLLIMPEXP_BASE bool wxUsingUnicowsDll();
 
 #endif // _WX_MSLU_H_