Removed some outdated compiler checks in OLE code.

We don't support VC++ 4 for ages and any recent version of GCC has
cVal, too.

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 2b10b4ae04376c879d9a4d12254098aa85d7713a..c2383e80e198637356ede5ade6b922ad38c6534c 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -148,14 +148,11 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }

-    // cVal not always present
-#ifndef __GNUWIN32__

     else if (type == wxT("char"))
     {
         oleVariant.vt=VT_I1;            // Signed Char
         oleVariant.cVal=variant.GetChar();
     }
     else if (type == wxT("char"))
     {
         oleVariant.vt=VT_I1;            // Signed Char
         oleVariant.cVal=variant.GetChar();
     }

-#endif

     else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;
     else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;


@@ -164,12 +161,7 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
     else if (type == wxT("bool"))
     {
         oleVariant.vt = VT_BOOL;
     else if (type == wxT("bool"))
     {
         oleVariant.vt = VT_BOOL;

-        // 'bool' required for VC++ 4 apparently
-#if (defined(__VISUALC__) && (__VISUALC__ <= 1000))
-        oleVariant.bool = variant.GetBool();
-#else

         oleVariant.boolVal = variant.GetBool();
         oleVariant.boolVal = variant.GetBool();

-#endif

     }
     else if (type == wxT("string"))
     {
     }
     else if (type == wxT("string"))
     {