Deal with wxVariant changed

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

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index 77d372d9937b86158cd923b12834926c681bf28a..ed8b6df44f188b7e02379abc1523ceb3e4996e61 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.cpp
+++ b/wxPython/contrib/activex/wxie/wxactivex.cpp
@@ -622,9 +622,9 @@ bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx)
     case VT_I1:
     case VT_UI1:
         if (byRef)
     case VT_I1:
     case VT_UI1:
         if (byRef)

-            vx = (char) *va.pbVal;
+            vx = (wxChar) *va.pbVal;

         else
         else

-            vx = (char) va.bVal;
+            vx = (wxChar) va.bVal;

         return true;
 
     // 2 byte shorts
         return true;
 
     // 2 byte shorts


@@ -757,9 +757,9 @@ bool VariantToMSWVariant(const wxVariant& vx, VARIANTARG& va)
     case VT_I1:
     case VT_UI1:
         if (byRef)
     case VT_I1:
     case VT_UI1:
         if (byRef)

-            *va.pbVal = (char) vx;
+            *va.pbVal = (wxChar) vx;

         else
         else

-            va.bVal = (char) vx;
+            va.bVal = (wxChar) vx;

         return true;
 
     // 2 byte shorts
         return true;
 
     // 2 byte shorts