]> git.saurik.com Git - wxWidgets.git/commitdiff
Also accept VT_R4 (float) VARIANTs in wxMSW OLE code.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 4 Jul 2011 14:05:11 +0000 (14:05 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 4 Jul 2011 14:05:11 +0000 (14:05 +0000)
We don't support creating VT_R4 VARIANTs as wxVariant can only contain double,
not float, but we can still at least accept them on input.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/ole/oleutils.cpp

index 9c50a53fdc8144bcfc0329bfb1bb0ae7c5584064..c992ce0af50b7f1811983bfcd17236b622a7fc14 100644 (file)
@@ -362,6 +362,10 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                 variant = oleVariant.boolVal != 0;
                 break;
 
                 variant = oleVariant.boolVal != 0;
                 break;
 
+            case VT_R4:
+                variant = oleVariant.fltVal;
+                break;
+
             case VT_R8:
                 variant = oleVariant.dblVal;
                 break;
             case VT_R8:
                 variant = oleVariant.dblVal;
                 break;