added wxConvFileName which is a variable, not define as wxConvFile; added comments explaining what different wxConvXXXs are for
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2591,13 +2591,19 @@ static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
|
||||
static wxMBConvUTF7 wxConvUTF7Obj;
|
||||
static wxMBConvUTF8 wxConvUTF8Obj;
|
||||
|
||||
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
|
||||
#ifdef __WXOSX__
|
||||
wxConvUTF8Obj;
|
||||
#else
|
||||
wxConvLibcObj;
|
||||
#endif
|
||||
|
||||
|
||||
#else // !wxUSE_WCHAR_T
|
||||
|
||||
|
Reference in New Issue
Block a user