From 1814658d67b74811a1e012701945a4d3564c9ef3 Mon Sep 17 00:00:00 2001 From: Robin Dunn <robin@alldunn.com> Date: Mon, 21 Feb 2005 18:34:20 +0000 Subject: [PATCH] fixed compile error git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/wxie/IEHtmlWin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxPython/contrib/activex/wxie/IEHtmlWin.cpp b/wxPython/contrib/activex/wxie/IEHtmlWin.cpp index b157fb9928..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) -- 2.47.2