AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added wxConvFileName which is a variable, not define as wxConvFile; added comments explaining what different wxConvXXXs are for

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-03-24 00:59:08 +00:00
parent 31f1a50e61
commit f5a1953b34
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
include/wx/strconv.h
View File

@ -86,11 +86,6 @@ public:
virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
}; };
// not very accurately named because it is not necessarily of type wxMBConvLibc
// (but the name can't eb changed because of backwards compatibility) default
// conversion
extern WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMBConvUTF7 (for conversion using UTF7 encoding) // wxMBConvUTF7 (for conversion using UTF7 encoding)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -102,8 +97,6 @@ public:
virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
}; };
extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMBConvUTF8 (for conversion using UTF8 encoding) // wxMBConvUTF8 (for conversion using UTF8 encoding)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -115,8 +108,6 @@ public:
virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
}; };
extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMBConvUTF16LE (for conversion using UTF16 Little Endian encoding) // wxMBConvUTF16LE (for conversion using UTF16 Little Endian encoding)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -210,16 +201,39 @@ private:
bool m_deferred; bool m_deferred;
}; };
#ifdef __WXOSX__ // ----------------------------------------------------------------------------
#define wxConvFile wxConvUTF8 // declare predefined conversion objects
#else // ----------------------------------------------------------------------------
#define wxConvFile wxConvLibc
#endif
extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal; // conversion to be used with all standard functions affected by locale, e.g.
// strtol(), strftime(), ...
extern WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc;
// conversion ISO-8859-1/UTF-7/UTF-8 <-> wchar_t
extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1; extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1;
extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7;
extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8;
// conversion used for the file names on the systems where they're not Unicode
// (basically anything except Windows)
//
// this is used by all file functions, can be changed by the application
//
// by default UTF-8 under Mac OS X and wxConvLibc elsewhere (but it's not used
// under Windows normally)
extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName;
// backwards compatible define
#define wxConvFile (*wxConvFileName)
// the current conversion object, may be set to any conversion, is used by
// default in a couple of places inside wx (initially same as wxConvLibc)
extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent; extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
// ???
extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// endianness-dependent conversions // endianness-dependent conversions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -244,19 +258,18 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
#endif #endif
#if wxMBFILES && wxUSE_UNICODE #if wxMBFILES && wxUSE_UNICODE
#define wxFNCONV(name) wxConvFile.cWX2MB(name) #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
#define wxFNSTRINGCAST wxMBSTRINGCAST #define wxFNSTRINGCAST wxMBSTRINGCAST
#else #else
#if defined( __WXOSX__ ) && wxMBFILES #if defined( __WXOSX__ ) && wxMBFILES
#define wxFNCONV(name) wxConvFile.cWC2MB( wxConvLocal.cWX2WC(name) ) #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
#else #else
#define wxFNCONV(name) name #define wxFNCONV(name) name
#endif #endif
#define wxFNSTRINGCAST WXSTRINGCAST #define wxFNSTRINGCAST WXSTRINGCAST
#endif #endif
#else #else // !wxUSE_WCHAR_T
// !wxUSE_WCHAR_T
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// stand-ins in absence of wchar_t // stand-ins in absence of wchar_t

8
src/common/strconv.cpp
View File

@ -2591,13 +2591,19 @@ static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
static wxMBConvUTF7 wxConvUTF7Obj; static wxMBConvUTF7 wxConvUTF7Obj;
static wxMBConvUTF8 wxConvUTF8Obj; static wxMBConvUTF8 wxConvUTF8Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj; WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj; WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj; WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj; WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj; WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj; WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
#ifdef __WXOSX__
wxConvUTF8Obj;
#else
wxConvLibcObj;
#endif
#else // !wxUSE_WCHAR_T #else // !wxUSE_WCHAR_T