added wxUSE_ACTIVEX which depends on wxUSE_VARIANT and which wxUSE_MEDIACTRL depends on (closes 1569606)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-02 22:37:07 +00:00
parent c2829a8f67
commit a1f48575d1
5 changed files with 116 additions and 52 deletions

View File

@@ -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)
@@ -1163,5 +1161,4 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
event.Skip();
}
#endif
// __WINE__
#endif // wxUSE_ACTIVEX