changed DoMessageFromThreadWait() to not block if there are no messages, this avoids...

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 86156519cb75c063704af0501ce01916045d178c..6096c4cf78abc696a30c222901912a27691cd5fc 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -544,7 +544,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 }
 
 
 }
 
 

-bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
+WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)

 {
     ClearVariant(&oleVariant);
     if (variant.IsNull())
 {
     ClearVariant(&oleVariant);
     if (variant.IsNull())


@@ -666,7 +666,7 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 #define VT_TYPEMASK 0xfff
 #endif
 
 #define VT_TYPEMASK 0xfff
 #endif
 

-bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
+WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)

 {
     switch (oleVariant.vt & VT_TYPEMASK)
     {
 {
     switch (oleVariant.vt & VT_TYPEMASK)
     {


@@ -851,9 +851,11 @@ static void ReleaseVariant(VARIANTARG *pvarg)
                 break;
 
             case VT_I2:
                 break;
 
             case VT_I2:

+            case VT_I4:

             case VT_BOOL:
             case VT_R8:
             case VT_ERROR:        // to avoid erroring on an error return from Excel
             case VT_BOOL:
             case VT_R8:
             case VT_ERROR:        // to avoid erroring on an error return from Excel

+            case VT_EMPTY:

                 // no work for these types
                 break;
 
                 // no work for these types
                 break;