(blind) GTK1 compilation fix

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

diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp
index 34fd2b1e2f19e647feeefbc71d1a65f9ec6cec9e..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++)
             {
@@ -985,7 +985,7 @@ void wxActiveX::OnSize(wxSizeEvent& event)
 
 void wxActiveX::OnPaint(wxPaintEvent& event)
 {
-       wxLogTrace(wxT("repainting activex win"));
+//     wxLogTrace(wxT("repainting activex win"));
        wxPaintDC dc(this);
        dc.BeginDrawing();
        int w, h;
@@ -1020,12 +1020,12 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
 {
        if (m_oleObjectHWND == NULL)
     {
-        wxLogTrace(wxT("no oleInPlaceObject"));
+//        wxLogTrace(wxT("no oleInPlaceObject"));
         event.Skip();
         return;
     }
 
-       wxLogTrace(wxT("mouse event"));
+//     wxLogTrace(wxT("mouse event"));
        UINT msg = 0;
        WPARAM wParam = 0;
        LPARAM lParam = 0;
@@ -1068,21 +1068,21 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
        wxString log;
        if (msg == 0)
     {
-        wxLogTrace(wxT("no message"));
+//        wxLogTrace(wxT("no message"));
         event.Skip(); return;
     };
 
        if (!::SendMessage(m_oleObjectHWND, msg, wParam, lParam))
     {
-        wxLogTrace(wxT("msg not delivered"));
+//        wxLogTrace(wxT("msg not delivered"));
         event.Skip();
         return;
     };
 
-       wxLogTrace(wxT("msg sent"));
+//     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);