cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file name char set string conversions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-11-17 15:14:35 +00:00
parent 22cfea03b8
commit d5c8817ce5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/strconv.h
View File

@ -210,7 +210,12 @@ private:
bool m_deferred; bool m_deferred;
}; };
#ifdef __WXOSX__
#define wxConvFile wxConvUTF8
#else
#define wxConvFile wxConvLocal #define wxConvFile wxConvLocal
#endif
WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvLocal; WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvLocal;
WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvISO8859_1; WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvISO8859_1;
WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent; WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;
@ -241,8 +246,12 @@ WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;
#if wxMBFILES && wxUSE_UNICODE #if wxMBFILES && wxUSE_UNICODE
#define wxFNCONV(name) wxConvFile.cWX2MB(name) #define wxFNCONV(name) wxConvFile.cWX2MB(name)
#define wxFNSTRINGCAST wxMBSTRINGCAST #define wxFNSTRINGCAST wxMBSTRINGCAST
#else
#if defined( __WXOSX__ ) && wxMBFILES
#define wxFNCONV(name) wxConvFile.cWC2MB( wxConvLocal.cWX2WC(name) )
#else #else
#define wxFNCONV(name) name #define wxFNCONV(name) name
#endif
#define wxFNSTRINGCAST WXSTRINGCAST #define wxFNSTRINGCAST WXSTRINGCAST
#endif #endif

5
include/wx/string.h
View File

@ -830,8 +830,11 @@ public:
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
const wxWCharBuffer wc_str(wxMBConv& conv) const; const wxWCharBuffer wc_str(wxMBConv& conv) const;
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
#ifdef __WXOSX__
const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLocal ) ); }
#else
const wxChar* fn_str() const { return c_str(); } const wxChar* fn_str() const { return c_str(); }
#endif
#endif // Unicode/ANSI #endif // Unicode/ANSI
// overloaded assignment // overloaded assignment