]> git.saurik.com Git - wxWidgets.git/commitdiff
Add support for VT_I8 (long long) values to wxAutomationObject.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 14 Apr 2012 22:31:57 +0000 (22:31 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 14 Apr 2012 22:31:57 +0000 (22:31 +0000)
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
src/msw/ole/oleutils.cpp

index ebbe812abc7e285d7bdc42f52a82fc9b34ab84f4..b33e43c2672e3fc2774511ed83dd888a0bd36a5b 100644 (file)
@@ -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:
 
index 923504963233a7aa969236db9da7e5cf3ac01dca..00de18484e28341d156f1a1016f1b9d3699ed1c3 100644 (file)
@@ -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;