Better fix

[wxWidgets.git] / src / msw / ole / activex.cpp

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 108bd936b982096aecd4cd3e4d02e00968e89a77..e8e7647a4850c8cc6ccfc25a1ff095d4455a9dac 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -23,15 +23,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_ACTIVEX
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/math.h"
-
-// I don't know why members of tagVARIANT aren't found when compiling
-// with Wine
-#ifndef __WINE__
+#include "wx/msw/dc.h"

 
 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here
 
 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here


@@ -897,7 +896,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
             continue;
 
         // check if default event sink
             continue;
 
         // check if default event sink

-        bool defInterface = false;

         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);
         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);


@@ -915,11 +913,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }

-            else
-            {
-                // WXOLE_TRACEOUT("Default Interface");
-                defInterface = true;
-            }

         }
 
 
         }
 
 


@@ -1132,8 +1125,9 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
         ::InvalidateRect(m_oleObjectHWND, NULL, false);
 #endif
         RECTL *prcBounds = (RECTL *) &posRect;
         ::InvalidateRect(m_oleObjectHWND, NULL, false);
 #endif
         RECTL *prcBounds = (RECTL *) &posRect;

+        wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );

         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,
         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,

-            (HDC)dc.GetHDC(), prcBounds, NULL, NULL, 0);
+            (HDC)msw->GetHDC(), prcBounds, NULL, NULL, 0);

     }
 }
 
     }
 }
 


@@ -1164,5 +1158,4 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-#endif
-// __WINE__
+#endif // wxUSE_ACTIVEX