Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed obsolete (Open) Watcom conditions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-20 13:24:48 +00:00
parent 02b7b6b072
commit afd23c224a
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/ole/automtn.cpp
View File

@@ -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"))
{

2
src/msw/ole/dataobj.cpp
View File

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