#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>
wxVariant retVariant;
if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
{
- if (retVariant.GetType() == _T("void*"))
+ if (retVariant.GetType() == wxT("void*"))
{
return (WXIDISPATCH*) retVariant.GetVoidPtr();
}
- else
- {
- return (WXIDISPATCH*) NULL;
- }
}
- else
- return (WXIDISPATCH*) NULL;
+
+ return (WXIDISPATCH*) NULL;
}
// A way of initialising another wxAutomationObject with a dispatch object
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
- wxLogWarning(_T("Cannot obtain CLSID from ProgID"));
+ wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
return FALSE;
}
if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
{
- wxLogWarning(_T("Cannot find an active object"));
+ wxLogWarning(wxT("Cannot find an active object"));
return FALSE;
}
if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
{
- wxLogWarning(_T("Cannot find IDispatch interface"));
+ wxLogWarning(wxT("Cannot find IDispatch interface"));
return FALSE;
}
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
- wxLogWarning(_T("Cannot obtain CLSID from ProgID"));
+ wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
return FALSE;
}
// start a new copy of Excel, grab the IDispatch interface
if (FAILED(CoCreateInstance(clsId, NULL, CLSCTX_LOCAL_SERVER, IID_IDispatch, (void**)&m_dispatchPtr)))
{
- wxLogWarning(_T("Cannot start an instance of this class."));
+ wxLogWarning(wxT("Cannot start an instance of this class."));
return FALSE;
}
wxString type(variant.GetType());
- if (type == _T("long"))
+ if (type == wxT("long"))
{
oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ;
}
- else if (type == _T("double"))
+ else if (type == wxT("double"))
{
oleVariant.vt = VT_R8;
oleVariant.dblVal = variant.GetDouble();
}
- else if (type == _T("bool"))
+ else if (type == wxT("bool"))
{
oleVariant.vt = VT_BOOL;
// 'bool' required for VC++ 4 apparently
oleVariant.boolVal = variant.GetBool();
#endif
}
- else if (type == _T("string"))
+ else if (type == wxT("string"))
{
wxString str( variant.GetString() );
oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str);
}
- else if (type == _T("date"))
+// 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() );
oleVariant.vt = VT_DATE;
0, 0, 0, oleVariant.date))
return FALSE;
}
- else if (type == _T("time"))
+ else if (type == wxT("time"))
{
wxTime time( variant.GetTime() );
oleVariant.vt = VT_DATE;
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE;
}
- else if (type == _T("void*"))
+#endif
+ else if (type == wxT("void*"))
{
oleVariant.vt = VT_DISPATCH;
oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
}
- else if (type == _T("list") || type == _T("stringlist"))
+ else if (type == wxT("list") || type == wxT("stringlist"))
{
oleVariant.vt = VT_VARIANT | VT_ARRAY;
}
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:
{
case VT_BOOL:
{
-#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
variant = (long) (oleVariant.bool != 0);
#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;
}
}
default:
{
- wxLogError(_T("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
+ wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
return FALSE;
}
}
}
else
{
- wxLogWarning(_T("ReleaseVariant: Array contains non-variant type"));
+ wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));
}
// Free the array itself.
break;
default:
- wxLogWarning(_T("ReleaseVariant: Unknown type"));
+ wxLogWarning(wxT("ReleaseVariant: Unknown type"));
break;
}
}
#endif
+#endif // __WATCOMC__
+