#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"
+ #include "wx/math.h"
#endif
#define _FORCENAMELESSUNION
#include "wx/msw/private.h"
#include "wx/msw/ole/oleutils.h"
#include "wx/msw/ole/automtn.h"
-#include "wx/math.h"
#ifdef __WXWINCE__
#include "wx/msw/wince/time.h"
CLSID clsId;
IUnknown * pUnk = NULL;
- wxBasicString unicodeName(classId.mb_str());
+ wxBasicString unicodeName(classId);
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
CLSID clsId;
- wxBasicString unicodeName(classId.mb_str());
+ wxBasicString unicodeName(classId);
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
unsigned short dosTime = 0;
VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
- long dosDateTime = (dosDate << 16) || dosTime;
+ long dosDateTime = (dosDate << 16) | dosTime;
wxDateTime date;
date.SetFromDOS(dosDateTime);
variant = date;
{
VARTYPE vt;
VARIANTARG _huge *pvargArray;
- long lLBound, lUBound, l;
+ LONG lLBound, lUBound, l;
vt = (VARTYPE)(pvarg->vt & 0xfff); // mask off flags
#endif
-#endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
+#endif // wxUSE_OLE_AUTOMATION