X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18680f86512504f043ad5d0b222afc7be87aa3e9..9ffdd8cf3c7aa760bec29050688487bb01806b83:/src/msw/ole/activex.cpp diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 2341500182..e54ffabb78 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -23,15 +23,13 @@ #pragma hdrstop #endif +#if wxUSE_ACTIVEX + #ifndef WX_PRECOMP #include "wx/dcclient.h" #include "wx/math.h" #endif -// I don't know why members of tagVARIANT aren't found when compiling -// with Wine -#ifndef __WINE__ - #include "wx/msw/ole/activex.h" // autointerfaces that we only use here WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceSite, IOleInPlaceSite) @@ -896,7 +894,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) continue; // check if default event sink - bool defInterface = false; bool defEventSink = false; int impTypeFlags = 0; typeInfo->GetImplTypeFlags(i, &impTypeFlags); @@ -914,11 +911,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) wxFAIL_MSG(wxT("Default event sink is in vtable!")); } } - else - { - // WXOLE_TRACEOUT("Default Interface"); - defInterface = true; - } } @@ -1163,5 +1155,4 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event) event.Skip(); } -#endif -// __WINE__ +#endif // wxUSE_ACTIVEX