X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85ac8ca017a0409e9762ed305ccc1d32a7c28fa7..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/contrib/activex/wxie/wxactivex.cpp 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++) {