X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/msw/ole/automtn.cpp diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 75a049fbcf..e29b9ab51e 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -25,6 +25,9 @@ #include #include +// Watcom C++ gives a linker error if this is compiled in. +#ifndef __WATCOMC__ + #include "wx/msw/ole/automtn.h" #include "wx/msw/private.h" @@ -551,6 +554,8 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) 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() ); @@ -569,6 +574,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date)) return FALSE; } +#endif else if (type == wxT("void*")) { oleVariant.vt = VT_DISPATCH; @@ -1159,3 +1165,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in #endif +#endif // __WATCOMC__ +