From cf9d4c676605b0829ed8457e63e6ce4fd3196428 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 7 Jan 2005 18:48:30 +0000 Subject: [PATCH] Added wxFopen to the MSLU code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/mslu.h | 1 + include/wx/wxchar.h | 6 +++++- src/msw/mslu.cpp | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/wx/msw/mslu.h b/include/wx/msw/mslu.h index 348ef3e8a4..ed8b9423e8 100644 --- a/include/wx/msw/mslu.h +++ b/include/wx/msw/mslu.h @@ -51,6 +51,7 @@ 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 FILE* wxMSLU__tfopen(const wxChar *name, const wxChar *mode); #if defined( __VISUALC__ ) \ || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index fdfb0da05f..45ccbc1c16 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -299,7 +299,11 @@ #define wxFgetc _fgettc #define wxFgetchar _fgettchar #define wxFgets _fgetts - #define wxFopen _tfopen + #if wxUSE_UNICODE_MSLU + #define wxFopen wxMSLU__tfopen + #else + #define wxFopen _tfopen + #endif #define wxFputc _fputtc #define wxFputchar _fputtchar #define wxFprintf _ftprintf diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp index eba45e13d7..f6f373a965 100644 --- a/src/msw/mslu.cpp +++ b/src/msw/mslu.cpp @@ -169,6 +169,14 @@ WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name) return _tremove(name); } +WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode) +{ + if ( wxUsingUnicowsDll() ) + return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode)); + else + return _tfopen(name,mode); +} + #if defined( __VISUALC__ ) \ || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) ) \ -- 2.45.2