add support for multiline labels in wxToggleButton

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index c39b3b2e4c164b5e0cc51d859ba8e8ba65ab504b..ed03f00d7f0033e44b02cf986524a9beefca05ca 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -674,6 +674,7 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
 WXDLLEXPORT bool
 wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 {
+    bool ok = true;
     if ( oleVariant.vt & VT_ARRAY )
     {
         variant.ClearList();
@@ -689,7 +690,6 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
         if ( FAILED(hr) )
             return false;
 
-        bool ok = true;
         for ( int i = 0; i < cElements; i++ )
         {
             VARIANTARG& oleElement = pvdata[i];
@@ -802,7 +802,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
         }
     }
 
-    return true;
+    return ok;
 }
 
 /*
@@ -886,6 +886,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
             case VT_R8:
             case VT_ERROR:        // to avoid erroring on an error return from Excel
             case VT_EMPTY:
+            case VT_DATE:
                 // no work for these types
                 break;