More small fixes

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 75a049fbcf23b0d98f6a57c570df8aba5f3907ca..7586cd9aae203e4e0515c13f50c35ab18b68a055 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -20,15 +20,19 @@
 #pragma hdrstop
 #endif
 
-#include "wx/log.h"
+#include "wx/defs.h"
 
-#include <math.h>
-#include <time.h>
+// Watcom C++ gives a linker error if this is compiled in.
+// With Borland C++, all samples crash if this is compiled in.
+#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 
+#include "wx/log.h"
 #include "wx/msw/ole/automtn.h"
-
 #include "wx/msw/private.h"
 
+#include <math.h>
+#include <time.h>
+
 #include <wtypes.h>
 #include <unknwn.h>
 #include <ole2.h>
@@ -81,9 +85,11 @@ static wxString ConvertStringFromOle(BSTR bStr);
 static int rgMonthDays[13] =
        {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
 
+#if wxUSE_TIMEDATE
 static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
        WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
 static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
+#endif // wxUSE_TIMEDATE
 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;
@@ -431,13 +437,9 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
                {
                        return (WXIDISPATCH*) retVariant.GetVoidPtr();
                }
-               else
-               {
-                       return (WXIDISPATCH*) NULL;
-               }
        }
-       else
-               return (WXIDISPATCH*) NULL;
+
+       return (WXIDISPATCH*) NULL;
 }
 
 // A way of initialising another wxAutomationObject with a dispatch object
@@ -551,6 +553,8 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
         oleVariant.vt = VT_BSTR;
         oleVariant.bstrVal = ConvertStringToOle(str);
     }
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
     else if (type == wxT("date"))
     {
         wxDate date( variant.GetDate() );
@@ -569,6 +573,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }
+#endif
     else if (type == wxT("void*"))
     {
         oleVariant.vt = VT_DISPATCH;
@@ -644,7 +649,8 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                }
        case VT_DATE:
                {
-                       struct tm tmTemp;
+#if wxUSE_TIMEDATE
+            struct tm tmTemp;
                        if (!TmFromOleDate(oleVariant.date, tmTemp))
                                return FALSE;
 
@@ -652,7 +658,9 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                        wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
 
                        variant = time;
-                       break;
+#endif
+
+            break;
                }
        case VT_I4:
                {
@@ -673,8 +681,12 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 #else
                        variant = (bool) (oleVariant.bool != 0);
 #endif
+#else
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+                       variant = (long) (oleVariant.boolVal != 0);
 #else
                        variant = (bool) (oleVariant.boolVal != 0);
+#endif
 #endif
                        break;
                }
@@ -1159,3 +1171,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
 
 #endif
 
+#endif // __WATCOMC__
+