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:
@@ -1038,10 +1038,6 @@ wxTextCtrl::StreamIn(const wxString& value,
|
||||
wxLogLastError(wxT("EM_STREAMIN"));
|
||||
}
|
||||
|
||||
#if !wxUSE_WCHAR_T
|
||||
free(wchBuf);
|
||||
#endif // !wxUSE_WCHAR_T
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1054,13 +1050,8 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
|
||||
|
||||
const int len = GetWindowTextLength(GetHwnd());
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
wxWCharBuffer wchBuf(len);
|
||||
wchar_t *wpc = wchBuf.data();
|
||||
#else
|
||||
wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
|
||||
wchar_t *wpc = wchBuf;
|
||||
#endif
|
||||
|
||||
wxStreamOutData data;
|
||||
data.wpc = wpc;
|
||||
@@ -1100,10 +1091,6 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
|
||||
}
|
||||
}
|
||||
|
||||
#if !wxUSE_WCHAR_T
|
||||
free(wchBuf);
|
||||
#endif // !wxUSE_WCHAR_T
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user