projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Smooth Aqua buttons in wxTreeCtrl.
[wxWidgets.git]
/
src
/
msw
/
ole
/
automtn.cpp
diff --git
a/src/msw/ole/automtn.cpp
b/src/msw/ole/automtn.cpp
index 934efa6354255768f3447bd8f117f4ab6f6241a9..ac4e48776dccdceb891813e33cde62102fe18826 100644
(file)
--- a/
src/msw/ole/automtn.cpp
+++ b/
src/msw/ole/automtn.cpp
@@
-20,15
+20,23
@@
#pragma hdrstop
#endif
#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 wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
+#include "wx/log.h"
#include "wx/msw/ole/automtn.h"
#include "wx/msw/ole/automtn.h"
-
#include "wx/msw/private.h"
#include "wx/msw/private.h"
+#include <math.h>
+#include <time.h>
+
+#include <wtypes.h>
+#include <unknwn.h>
+#include <ole2.h>
+#define _huge
#include <ole2ver.h>
#include <oleauto.h>
#include <ole2ver.h>
#include <oleauto.h>
@@
-77,12
+85,11
@@
static wxString ConvertStringFromOle(BSTR bStr);
static int rgMonthDays[13] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
static int rgMonthDays[13] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+#if wxUSE_TIMEDATE
static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
-static void TmConvertToStandardFormat(struct tm& tmSrc);
-static double DoubleFromDate(DATE dt);
-static DATE DateFromDouble(double dbl);
+#endif // wxUSE_TIMEDATE
static void ClearVariant(VARIANTARG *pvarg) ;
static void ReleaseVariant(VARIANTARG *pvarg) ;
static void ClearVariant(VARIANTARG *pvarg) ;
static void ReleaseVariant(VARIANTARG *pvarg) ;
@@
-426,17
+433,13
@@
WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
wxVariant retVariant;
if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
{
wxVariant retVariant;
if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
{
- if (retVariant.GetType() ==
"void*"
)
+ if (retVariant.GetType() ==
wxT("void*")
)
{
return (WXIDISPATCH*) retVariant.GetVoidPtr();
}
{
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
}
// A way of initialising another wxAutomationObject with a dispatch object
@@
-462,23
+465,23
@@
bool wxAutomationObject::GetInstance(const wxString& classId) const
CLSID clsId;
IUnknown * pUnk = NULL;
CLSID clsId;
IUnknown * pUnk = NULL;
- BasicString unicodeName(
(const char*) classId
);
+ BasicString unicodeName(
classId.mb_str()
);
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
- wxLogWarning(
"Cannot obtain CLSID from ProgID"
);
+ wxLogWarning(
wxT("Cannot obtain CLSID from ProgID")
);
return FALSE;
}
if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
{
return FALSE;
}
if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
{
- wxLogWarning(
"Cannot find an active object"
);
+ wxLogWarning(
wxT("Cannot find an active object")
);
return FALSE;
}
if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
{
return FALSE;
}
if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
{
- wxLogWarning(
"Cannot find IDispatch interface"
);
+ wxLogWarning(
wxT("Cannot find IDispatch interface")
);
return FALSE;
}
return FALSE;
}
@@
-493,20
+496,19
@@
bool wxAutomationObject::CreateInstance(const wxString& classId) const
return FALSE;
CLSID clsId;
return FALSE;
CLSID clsId;
- IUnknown * pUnk = NULL;
- BasicString unicodeName(
(const char*) classId
);
+ BasicString unicodeName(
classId.mb_str()
);
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
{
- wxLogWarning(
"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)))
{
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(
"Cannot start an instance of this class."
);
+ wxLogWarning(
wxT("Cannot start an instance of this class.")
);
return FALSE;
}
return FALSE;
}
@@
-525,17
+527,17
@@
bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
wxString type(variant.GetType());
wxString type(variant.GetType());
- if (type ==
"long"
)
+ if (type ==
wxT("long")
)
{
oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ;
}
{
oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ;
}
- else if (type ==
"double"
)
+ else if (type ==
wxT("double")
)
{
oleVariant.vt = VT_R8;
oleVariant.dblVal = variant.GetDouble();
}
{
oleVariant.vt = VT_R8;
oleVariant.dblVal = variant.GetDouble();
}
- else if (type ==
"bool"
)
+ else if (type ==
wxT("bool")
)
{
oleVariant.vt = VT_BOOL;
// 'bool' required for VC++ 4 apparently
{
oleVariant.vt = VT_BOOL;
// 'bool' required for VC++ 4 apparently
@@
-545,13
+547,15
@@
bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
oleVariant.boolVal = variant.GetBool();
#endif
}
oleVariant.boolVal = variant.GetBool();
#endif
}
- else if (type ==
"string"
)
+ else if (type ==
wxT("string")
)
{
wxString str( variant.GetString() );
oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str);
}
{
wxString str( variant.GetString() );
oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str);
}
- else if (type == "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;
{
wxDate date( variant.GetDate() );
oleVariant.vt = VT_DATE;
@@
-560,7
+564,7
@@
bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
0, 0, 0, oleVariant.date))
return FALSE;
}
0, 0, 0, oleVariant.date))
return FALSE;
}
- else if (type ==
"time"
)
+ else if (type ==
wxT("time")
)
{
wxTime time( variant.GetTime() );
oleVariant.vt = VT_DATE;
{
wxTime time( variant.GetTime() );
oleVariant.vt = VT_DATE;
@@
-569,12
+573,13
@@
bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE;
}
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE;
}
- else if (type == "void*")
+#endif
+ else if (type == wxT("void*"))
{
oleVariant.vt = VT_DISPATCH;
oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
}
{
oleVariant.vt = VT_DISPATCH;
oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
}
- else if (type ==
"list" || type == "stringlist"
)
+ else if (type ==
wxT("list") || type == wxT("stringlist")
)
{
oleVariant.vt = VT_VARIANT | VT_ARRAY;
{
oleVariant.vt = VT_VARIANT | VT_ARRAY;
@@
-644,7
+649,8
@@
bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
}
case VT_DATE:
{
}
case VT_DATE:
{
- struct tm tmTemp;
+#if wxUSE_TIMEDATE
+ struct tm tmTemp;
if (!TmFromOleDate(oleVariant.date, tmTemp))
return FALSE;
if (!TmFromOleDate(oleVariant.date, tmTemp))
return FALSE;
@@
-652,7
+658,9
@@
bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
variant = time;
wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
variant = time;
- break;
+#endif
+
+ break;
}
case VT_I4:
{
}
case VT_I4:
{
@@
-667,14
+675,18
@@
bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
case VT_BOOL:
{
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
#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);
#else
variant = (bool) (oleVariant.boolVal != 0);
+#endif
#endif
break;
}
#endif
break;
}
@@
-728,7
+740,7
@@
bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
}
default:
{
}
default:
{
- wxLogError(
"wxAutomationObject::ConvertOleToVariant: Unknown variant value type"
);
+ wxLogError(
wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type")
);
return FALSE;
}
}
return FALSE;
}
}
@@
-745,7
+757,7
@@
static BSTR ConvertStringToOle(const wxString& str)
for (i=0; i < len; i++)
s[i*2] = str[i];
*/
for (i=0; i < len; i++)
s[i*2] = str[i];
*/
- BasicString bstr(
(const char*) str
);
+ BasicString bstr(
str.mb_str()
);
return bstr.Get();
}
return bstr.Get();
}
@@
-753,7
+765,7
@@
static wxString ConvertStringFromOle(BSTR bStr)
{
int len = SysStringLen(bStr) + 1;
char *buf = new char[len];
{
int len = SysStringLen(bStr) + 1;
char *buf = new char[len];
-
int i =
wcstombs( buf, bStr, len);
+
(void)
wcstombs( buf, bStr, len);
wxString str(buf);
delete[] buf;
wxString str(buf);
delete[] buf;
@@
-969,6
+981,8
@@
DoTime:
return TRUE;
}
return TRUE;
}
+// this function is not used
+#if 0
void TmConvertToStandardFormat(struct tm& tmSrc)
{
// Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
void TmConvertToStandardFormat(struct tm& tmSrc)
{
// Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
@@
-1001,6
+1015,7
@@
DATE DateFromDouble(double dbl)
double temp = floor(dbl); // dbl is now whole part
return temp + (temp - dbl);
}
double temp = floor(dbl); // dbl is now whole part
return temp + (temp - dbl);
}
+#endif // 0
/*
* ClearVariant
/*
* ClearVariant
@@
-1058,7
+1073,7
@@
static void ReleaseVariant(VARIANTARG *pvarg)
}
else
{
}
else
{
- wxLogWarning(
"ReleaseVariant: Array contains non-variant type"
);
+ wxLogWarning(
wxT("ReleaseVariant: Array contains non-variant type")
);
}
// Free the array itself.
}
// Free the array itself.
@@
-1085,7
+1100,7
@@
static void ReleaseVariant(VARIANTARG *pvarg)
break;
default:
break;
default:
- wxLogWarning(
"ReleaseVariant: Unknown type"
);
+ wxLogWarning(
wxT("ReleaseVariant: Unknown type")
);
break;
}
}
break;
}
}
@@
-1156,3
+1171,5
@@
void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
#endif
#endif
+#endif // __WATCOMC__
+