diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index e559ff9d0a..e4114afd26 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -611,28 +611,6 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) oleVariant.vt = VT_BSTR; oleVariant.bstrVal = wxConvertStringToOle(str); } -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -// Now obsolete -#if 0 // wxUSE_TIMEDATE && !defined(__WATCOMC__) - else if (type == wxT("date")) - { - wxDate date( variant.GetDate() ); - oleVariant.vt = VT_DATE; - - if (!OleDateFromTm(date.GetYear(), date.GetMonth(), date.GetDay(), - 0, 0, 0, oleVariant.date)) - return false; - } - else if (type == wxT("time")) - { - wxTime time( variant.GetTime() ); - oleVariant.vt = VT_DATE; - - if (!OleDateFromTm(time.GetYear(), time.GetMonth(), time.GetDay(), - time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date)) - return false; - } -#endif #if wxUSE_DATETIME else if (type == wxT("datetime")) { diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index df1a25d255..b00c440a15 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -465,7 +465,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, case CF_OEMTEXT: size = strlen((const char *)pBuf); break; -#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) +#if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) case CF_UNICODETEXT: #if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) )