X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7c75283f2144469e8fa6a24ca285b42fab69a6b..1e2cb856c4849b0956c21f053be2bc8f30b881fb:/wxPython/contrib/activex/wxie/IEHtmlWin.cpp diff --git a/wxPython/contrib/activex/wxie/IEHtmlWin.cpp b/wxPython/contrib/activex/wxie/IEHtmlWin.cpp index cab5efcdd7..955be06100 100644 --- a/wxPython/contrib/activex/wxie/IEHtmlWin.cpp +++ b/wxPython/contrib/activex/wxie/IEHtmlWin.cpp @@ -77,7 +77,7 @@ HRESULT STDMETHODCALLTYPE IStreamAdaptorBase::Read(void __RPC_FAR *pv, ULONG cb, { if (prepend.size() > 0) { - int n = min(prepend.size(), cb); + int n = wxMin(prepend.size(), cb); prepend.copy((char *) pv, n); prepend = prepend.substr(n); if (pcbRead) @@ -328,7 +328,7 @@ bool wxIEHtmlWin::GoHome() { try { - CallMethod("GoHome"); + CallMethod(_T("GoHome")); return true; } catch(exception&)