Fix for wxUSE_WCHAR_T == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -54,6 +54,7 @@
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
#define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
|
||||
#define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
|
||||
|
||||
@@ -95,8 +96,6 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
|
||||
#ifdef WC_UTF16
|
||||
|
||||
static size_t encode_utf16(wxUint32 input, wchar_t *output)
|
||||
@@ -970,6 +969,7 @@ public:
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
|
||||
WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
|
||||
|
||||
#endif // wxUSE_WCHAR_T
|
||||
|
||||
|
Reference in New Issue
Block a user