Fix wxString unit test when not using UTF-8.

[wxWidgets.git] / src / msw / ole / oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 923504963233a7aa969236db9da7e5cf3ac01dca..0ba95fc800ca6589d5138b9e9fdeb6852bcace02 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -148,6 +148,19 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }

+    // Original VC6 came with SDK too old to contain VARIANT::llVal declaration
+    // and there doesn't seem to be any way to test for it as Microsoft simply
+    // added it to the later version of oaidl.h without changing anything else.
+    // So assume it's not present for VC6, even though it might be if an
+    // updated SDK is used. In this case the user would need to disable this
+    // check himself.
+#if wxUSE_LONGLONG && !defined(__VISUALC6__)
+    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
     else if (type == wxT("char"))
     {
         oleVariant.vt=VT_I1;            // Signed Char


@@ -350,6 +363,13 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 #endif // wxUSE_DATETIME
                 break;
 
 #endif // wxUSE_DATETIME
                 break;
 

+                // See the comment before the __VISUALC6__ test above.
+#if wxUSE_LONGLONG && !defined(__VISUALC6__)
+            case VT_I8:
+                variant = wxLongLong(oleVariant.llVal);
+                break;
+#endif // wxUSE_LONGLONG
+

             case VT_I4:
                 variant = (long) oleVariant.lVal;
                 break;
             case VT_I4:
                 variant = (long) oleVariant.lVal;
                 break;