#pragma hdrstop
#endif
-#include "wx/log.h"
+#include "wx/defs.h"
-#include <math.h>
-#include <time.h>
+// Watcom C++ gives a linker error if this is compiled in.
+// With Borland C++, all samples crash if this is compiled in.
+#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520))
+#include "wx/log.h"
#include "wx/msw/ole/automtn.h"
-
#include "wx/msw/private.h"
+#include <math.h>
+#include <time.h>
+
#include <wtypes.h>
#include <unknwn.h>
#include <ole2.h>
oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str);
}
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
else if (type == wxT("date"))
{
wxDate date( variant.GetDate() );
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE;
}
+#endif
else if (type == wxT("void*"))
{
oleVariant.vt = VT_DISPATCH;
}
case VT_DATE:
{
- struct tm tmTemp;
+#if wxUSE_TIMEDATE
+ struct tm tmTemp;
if (!TmFromOleDate(oleVariant.date, tmTemp))
return FALSE;
wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
variant = time;
- break;
+#endif
+
+ break;
}
case VT_I4:
{
#else
variant = (bool) (oleVariant.bool != 0);
#endif
+#else
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+ variant = (long) (oleVariant.boolVal != 0);
#else
variant = (bool) (oleVariant.boolVal != 0);
+#endif
#endif
break;
}
#endif
+#endif // __WATCOMC__
+