From 4876ba0b23ee5be5f165cd4f0f53d6a4d4d46fa4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Oct 2006 11:27:24 +0000 Subject: [PATCH] declare wxMSLU_xxx functions in the headers which define macros expanding to them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/filefn.h | 2 ++ include/wx/msw/mslu.h | 9 +++------ include/wx/wxchar.h | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 6245adc989..eca68ca64b 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -239,6 +239,8 @@ enum wxFileKind #if wxUSE_UNICODE #if wxUSE_UNICODE_MSLU + #include "wx/msw/mslu.h" + #define wxOpen wxMSLU__wopen #define wxAccess wxMSLU__waccess diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h index a8ce885e11..7bb088c926 100644 --- a/include/wx/msw/mslu.h +++ b/include/wx/msw/mslu.h @@ -43,16 +43,12 @@ WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn); WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn); #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn) -#endif +#endif // wxUSE_GUI //------------------------------------------------------------------------ // 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); -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__) ) \ @@ -70,7 +66,8 @@ 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 // Windows compilers with MSLU support #endif // wxUSE_UNICODE_MSLU diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 06e5bf61de..81d06ed624 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -329,6 +329,8 @@ #define wxFgetchar _fgettchar #define wxFgets _fgetts #if wxUSE_UNICODE_MSLU + WXDLLIMPEXP_BASE FILE * wxMSLU__tfopen(const wxChar *name, const wxChar *mode); + #define wxFopen wxMSLU__tfopen #else #define wxFopen _tfopen @@ -371,6 +373,9 @@ /* special case: these functions are missing under Win9x with Unicows so we */ /* have to implement them ourselves */ #if wxUSE_UNICODE_MSLU + WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname); + WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name); + #define wxRemove wxMSLU__tremove #define wxRename wxMSLU__trename #else