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:
@@ -269,8 +269,12 @@ public:
|
||||
virtual ~wxHtmlEntitiesParser();
|
||||
|
||||
// Sets encoding of output string.
|
||||
// Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
|
||||
// Has no effect if wxUSE_UNICODE==1
|
||||
#if wxUSE_UNICODE
|
||||
void SetEncoding(wxFontEncoding WXUNUSED(encoding)) {}
|
||||
#else
|
||||
void SetEncoding(wxFontEncoding encoding);
|
||||
#endif
|
||||
|
||||
// Parses entities in input and replaces them with respective characters
|
||||
// (with respect to output encoding)
|
||||
@@ -287,7 +291,7 @@ public:
|
||||
#endif
|
||||
|
||||
protected:
|
||||
#if wxUSE_WCHAR_T && !wxUSE_UNICODE
|
||||
#if !wxUSE_UNICODE
|
||||
wxMBConv *m_conv;
|
||||
wxFontEncoding m_encoding;
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user