Detect Apple bug that prevents the joystick code compiling for OS X 10.1

[wxWidgets.git] / wxPython / contrib / iewin / wxactivex.cpp

diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp
index 5196a9f6f6fbc52794cd0cedfac512f1816914e2..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
-            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++)
             {
@@ -1082,7 +1082,7 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
 //     wxLogTrace(wxT("msg sent"));
 }
 
-long wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
        if (m_oleObjectHWND == NULL)
         return wxWindow::MSWWindowProc(nMsg, wParam, lParam);