Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxUSE_VARIANT and the related checks, also added wxUSE_OLE_AUTOMATION

Browse Source 
to guard wxAutomationObject code which depends on wxVariant


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-24 13:12:56 +00:00
parent 19883268f1
commit ca5c6ac3f4
19 changed files with 590 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/ole/automtn.cpp
View File

@@ -16,9 +16,13 @@
#pragma hdrstop
#endif
// Watcom C++ gives a linker error if this is compiled in.
// With Borland C++, all samples crash if this is compiled in.
#if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
#if (defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) || defined(__CYGWIN10__)
#undef wxUSE_OLE_AUTOMATION
#define wxUSE_OLE_AUTOMATION 0
#endif
#if wxUSE_OLE_AUTOMATION
#ifndef WX_PRECOMP
#include "wx/log.h"
@@ -932,4 +936,4 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
#endif
#endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
#endif // wxUSE_OLE_AUTOMATION