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

was crashing wxCocoa builds (decomposition will be needed there as well, but the current implementation is based on the TEConverters)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-07-04 09:12:34 +00:00
parent 56f33b5ecd
commit d43d9ee796
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -3507,7 +3507,7 @@ static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1); static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
static wxMBConvUTF7 wxConvUTF7Obj; static wxMBConvUTF7 wxConvUTF7Obj;
static wxMBConvUTF8 wxConvUTF8Obj; static wxMBConvUTF8 wxConvUTF8Obj;
#ifdef __WXOSX__ #if defined(__WXMAC__) && defined(TARGET_CARBON)
static wxMBConv_macUTF8D wxConvMacUTF8DObj; static wxMBConv_macUTF8D wxConvMacUTF8DObj;
#endif #endif
WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj; WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
@@ -3519,7 +3519,11 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal; WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = & WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
#ifdef __WXOSX__ #ifdef __WXOSX__
#if defined(__WXMAC__) && defined(TARGET_CARBON)
wxConvMacUTF8DObj; wxConvMacUTF8DObj;
#else
wxConvUTF8Obj;
#endif
#else #else
wxConvLibcObj; wxConvLibcObj;
#endif #endif