Remove wxUSE_WCHAR_T checks.
wxWidgets requires wchar_t for some time now; wx/chartype.h has a check to fail complation without it. Simplify code by removing now-dead code for the !wxUSE_WCHAR_T case. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,8 +28,6 @@
|
||||
|
||||
#include "wx/strconv.h"
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
#include <errno.h>
|
||||
#endif
|
||||
@@ -3455,14 +3453,3 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName =
|
||||
#else // !__DARWIN__
|
||||
wxGet_wxConvLibcPtr();
|
||||
#endif // __DARWIN__/!__DARWIN__
|
||||
|
||||
#else // !wxUSE_WCHAR_T
|
||||
|
||||
// FIXME-UTF8: remove this, wxUSE_WCHAR_T is required now
|
||||
// stand-ins in absence of wchar_t
|
||||
WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
|
||||
wxConvISO8859_1,
|
||||
wxConvLocal,
|
||||
wxConvUTF8;
|
||||
|
||||
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
|
||||
|
Reference in New Issue
Block a user