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

make wxConvUTF8 available in wchar_t-less mode, too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-02-23 19:01:54 +00:00
parent 4561e95d96
commit 1da51aafba
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/strconv.h
View File

@@ -174,7 +174,7 @@ public:
const char* cWX2MB(const char *psz) const { return psz; } 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; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxFNCONV(name) name #define wxFNCONV(name) name

3
src/common/strconv.cpp
View File

@@ -58,7 +58,8 @@
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, WXDLLEXPORT_DATA(wxMBConv) wxConvLibc,
wxConvFile, wxConvFile,
wxConvISO8859_1, wxConvISO8859_1,
wxConvLocal; wxConvLocal,
wxConvUTF8;
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc; WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;