diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 050fbac84a..7d22b34c0a 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -138,6 +138,7 @@ private: #define wxConvFile wxConvLocal WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal; +WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; // ---------------------------------------------------------------------------- @@ -173,7 +174,7 @@ public: const char* cWX2MB(const char *psz) const { return psz; } }; -WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal; +WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; #define wxFNCONV(name) name diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 8d8d255d43..a14743d43d 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -52,6 +52,7 @@ #if wxUSE_WCHAR_T WXDLLEXPORT_DATA(wxMBConv) wxConvLibc; WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL); + WXDLLEXPORT_DATA(wxCSConv) wxConvISO8859_1(_T("iso-8859-1")); #else // stand-ins in absence of wchar_t WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile, wxConvLocal; @@ -68,6 +69,7 @@ public: { #if wxUSE_WCHAR_T wxConvLocal.Clear(); + wxConvISO8859_1.Clear(); #endif }