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

Add support for VT_I8 (long long) values to wxAutomationObject.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-04-14 22:31:57 +00:00
parent 4eeceb1573
commit 4b666be659
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -525,6 +525,7 @@ MSW:
- Implement wxGraphicsContext::SetInterpolationQuality() (Eric Jensen). - Implement wxGraphicsContext::SetInterpolationQuality() (Eric Jensen).
- Fix coordinate handling in wxDC::Blit() when source DC is a DIB. - Fix coordinate handling in wxDC::Blit() when source DC is a DIB.
- Fix handling of composite windows in wxToolTip (Armel Asselin). - Fix handling of composite windows in wxToolTip (Armel Asselin).
- Add VT_I8 support to wxAutomationObject (PB).
OSX: OSX:

13
src/msw/ole/oleutils.cpp
View File

@@ -148,6 +148,13 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
oleVariant.vt = VT_I4; oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ; 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")) else if (type == wxT("char"))
{ {
oleVariant.vt=VT_I1; // Signed Char oleVariant.vt=VT_I1; // Signed Char
@@ -350,6 +357,12 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
break; break;
#if wxUSE_LONGLONG
case VT_I8:
variant = wxLongLong(oleVariant.llVal);
break;
#endif // wxUSE_LONGLONG
case VT_I4: case VT_I4:
variant = (long) oleVariant.lVal; variant = (long) oleVariant.lVal;
break; break;