From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Fri, 20 Aug 2004 13:24:48 +0000 (+0000)
Subject: Removed obsolete (Open) Watcom conditions.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/afd23c224adf19f62353d8ec309db91747cbf237

Removed obsolete (Open) Watcom conditions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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__) )