use wxMin

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index 3ef27da80b869aa13c46ee86cb968c9f4aed1b6a..96a4a51480cd5eca71bf038762e025ef5e181bf0 100644 (file)
--- 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
         {
             // 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];
             for (int i = nArg - 1; i >= 0; i--)
             {
                 VARIANTARG& va = pDispParams->rgvarg[i];


@@ -908,7 +908,7 @@ public:
 
         if (func.hasOut)
         {
 
         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++)
             {
             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 a77919344fbe3e61a2d9efca7e5cedb8416f909c..ca8f66394a8cde7ea3fdb04b9f440366fc805082 100644 (file)
--- 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
         {
                        // 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];
             for (int i = nArg - 1; i >= 0; i--)
             {
                 VARIANTARG& va = pDispParams->rgvarg[i];


@@ -581,7 +581,7 @@ public:
 
                if (func.hasOut)
                {
 
                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++)
             {
                m_activeX->GetParent()->ProcessEvent(event);
             for (int i = 0; i < nArg; i++)
             {