Corrected _setCallbackInfo code so GiveFeedback can work

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

diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp
index 34fd2b1e2f19e647feeefbc71d1a65f9ec6cec9e..a77919344fbe3e61a2d9efca7e5cedb8416f909c 100644 (file)
--- a/wxPython/contrib/iewin/wxactivex.cpp
+++ b/wxPython/contrib/iewin/wxactivex.cpp
@@ -985,7 +985,7 @@ void wxActiveX::OnSize(wxSizeEvent& event)
 
 void wxActiveX::OnPaint(wxPaintEvent& event)
 {
 
 void wxActiveX::OnPaint(wxPaintEvent& event)
 {

-       wxLogTrace(wxT("repainting activex win"));
+//     wxLogTrace(wxT("repainting activex win"));

        wxPaintDC dc(this);
        dc.BeginDrawing();
        int w, h;
        wxPaintDC dc(this);
        dc.BeginDrawing();
        int w, h;


@@ -1020,12 +1020,12 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
 {
        if (m_oleObjectHWND == NULL)
     {
 {
        if (m_oleObjectHWND == NULL)
     {

-        wxLogTrace(wxT("no oleInPlaceObject"));
+//        wxLogTrace(wxT("no oleInPlaceObject"));

         event.Skip();
         return;
     }
 
         event.Skip();
         return;
     }
 

-       wxLogTrace(wxT("mouse event"));
+//     wxLogTrace(wxT("mouse event"));

        UINT msg = 0;
        WPARAM wParam = 0;
        LPARAM lParam = 0;
        UINT msg = 0;
        WPARAM wParam = 0;
        LPARAM lParam = 0;


@@ -1068,21 +1068,21 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
        wxString log;
        if (msg == 0)
     {
        wxString log;
        if (msg == 0)
     {

-        wxLogTrace(wxT("no message"));
+//        wxLogTrace(wxT("no message"));

         event.Skip(); return;
     };
 
        if (!::SendMessage(m_oleObjectHWND, msg, wParam, lParam))
     {
         event.Skip(); return;
     };
 
        if (!::SendMessage(m_oleObjectHWND, msg, wParam, lParam))
     {

-        wxLogTrace(wxT("msg not delivered"));
+//        wxLogTrace(wxT("msg not delivered"));

         event.Skip();
         return;
     };
 
         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);
 {
        if (m_oleObjectHWND == NULL)
         return wxWindow::MSWWindowProc(nMsg, wParam, lParam);