From a96fdef31fa83fbe6e8dac52dfe141c75ee789a2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 28 Feb 2005 18:36:57 +0000 Subject: [PATCH] use wxMin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/wxie/wxactivex.cpp | 4 ++-- wxPython/contrib/iewin/wxactivex.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp index 3ef27da80b..96a4a51480 100644 --- a/wxPython/contrib/activex/wxie/wxactivex.cpp +++ b/wxPython/contrib/activex/wxie/wxactivex.cpp @@ -893,7 +893,7 @@ public: { // cdecl call // sometimes the pDispParams does not match the param info for a activex control - int nArg = min(func.params.size(), pDispParams->cArgs); + int nArg = wxMin(func.params.size(), pDispParams->cArgs); for (int i = nArg - 1; i >= 0; i--) { VARIANTARG& va = pDispParams->rgvarg[i]; @@ -908,7 +908,7 @@ public: if (func.hasOut) { - int nArg = min(func.params.size(), pDispParams->cArgs); + int nArg = wxMin(func.params.size(), pDispParams->cArgs); m_activeX->GetEventHandler()->ProcessEvent(event); for (int i = 0; i < nArg; i++) { diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp index a77919344f..ca8f66394a 100644 --- a/wxPython/contrib/iewin/wxactivex.cpp +++ b/wxPython/contrib/iewin/wxactivex.cpp @@ -566,7 +566,7 @@ public: { // cdecl call // sometimes the pDispParams does not match the param info for a activex control - int nArg = min(func.params.size(), pDispParams->cArgs); + int nArg = wxMin(func.params.size(), pDispParams->cArgs); for (int i = nArg - 1; i >= 0; i--) { VARIANTARG& va = pDispParams->rgvarg[i]; @@ -581,7 +581,7 @@ public: if (func.hasOut) { - int nArg = min(func.params.size(), pDispParams->cArgs); + int nArg = wxMin(func.params.size(), pDispParams->cArgs); m_activeX->GetParent()->ProcessEvent(event); for (int i = 0; i < nArg; i++) { -- 2.50.0