From 4b666be65941bb7a53c3af561a0fee907e83d6ee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 14 Apr 2012 22:31:57 +0000 Subject: [PATCH] Add support for VT_I8 (long long) values to wxAutomationObject. Just map VT_I8 to wxLongLong. Closes #14210. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/ole/oleutils.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index ebbe812abc..b33e43c267 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -525,6 +525,7 @@ MSW: - Implement wxGraphicsContext::SetInterpolationQuality() (Eric Jensen). - Fix coordinate handling in wxDC::Blit() when source DC is a DIB. - Fix handling of composite windows in wxToolTip (Armel Asselin). +- Add VT_I8 support to wxAutomationObject (PB). OSX: diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 9235049632..00de18484e 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -148,6 +148,13 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole oleVariant.vt = VT_I4; oleVariant.lVal = variant.GetLong() ; } +#if wxUSE_LONGLONG + else if (type == wxT("longlong")) + { + oleVariant.vt = VT_I8; + oleVariant.llVal = variant.GetLongLong().GetValue(); + } +#endif else if (type == wxT("char")) { oleVariant.vt=VT_I1; // Signed Char @@ -350,6 +357,12 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) #endif // wxUSE_DATETIME break; +#if wxUSE_LONGLONG + case VT_I8: + variant = wxLongLong(oleVariant.llVal); + break; +#endif // wxUSE_LONGLONG + case VT_I4: variant = (long) oleVariant.lVal; break; -- 2.45.2