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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 6245adc989364fe57299912d8aa01994d22001f0..eca68ca64b67b6e60eb72919847e9ea79b5f8320 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -239,6 +239,8 @@ enum wxFileKind
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU

+            #include "wx/msw/mslu.h"
+

             #define   wxOpen       wxMSLU__wopen
 
             #define   wxAccess     wxMSLU__waccess
             #define   wxOpen       wxMSLU__wopen
 
             #define   wxAccess     wxMSLU__waccess

diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h
index a8ce885e11b25998c73aa2f7d74a9e1f56ee248f..7bb088c9264b1141e6af566ce79e3db59c47fd36 100644 (file)
--- 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)
 
 WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
 

-#endif
+#endif // wxUSE_GUI

 
 //------------------------------------------------------------------------
 // Missing libc file manipulation functions in Win9x
 //------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------
 // 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__) ) \
 #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);
 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
 
 
 #endif // wxUSE_UNICODE_MSLU
 

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 06e5bf61de45da8c339931f7f54e738a7bf36895..81d06ed6248620831c758879cf6ec2a36723ae19 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -329,6 +329,8 @@
     #define  wxFgetchar  _fgettchar
     #define  wxFgets     _fgetts
     #if wxUSE_UNICODE_MSLU
     #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
         #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
     /* 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
         #define  wxRemove    wxMSLU__tremove
         #define  wxRename    wxMSLU__trename
     #else