From: Václav Slavík Date: Sun, 23 Feb 2003 19:01:54 +0000 (+0000) Subject: make wxConvUTF8 available in wchar_t-less mode, too X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1da51aafba47af813ed5165855c819f490086f85 make wxConvUTF8 available in wchar_t-less mode, too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 7d22b34c0a..2e651a9940 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -174,7 +174,7 @@ public: const char* cWX2MB(const char *psz) const { return psz; } }; -WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1; +WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; #define wxFNCONV(name) name diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index b15169ac54..75c6201df8 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -58,7 +58,8 @@ WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile, wxConvISO8859_1, - wxConvLocal; + wxConvLocal, + wxConvUTF8; #endif // wxUSE_WCHAR_T WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;