Fix to excule OnPaint from WXPM

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index f8bac3d40085236332d47d5a5049e6de8fa268da..a5c49e721bb4d6668f22b3ecede9d5f19cdd62bd 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -20,15 +20,23 @@
 #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))
 
+#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>
+#define _huge
 #include <ole2ver.h>
 #include <oleauto.h>
 
@@ -423,17 +431,13 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
        wxVariant retVariant;
        if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
        {
-               if (retVariant.GetType() == "void*")
+               if (retVariant.GetType() == wxT("void*"))
                {
                        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
@@ -459,23 +463,23 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
        CLSID clsId;
        IUnknown * pUnk = NULL;
 
-       BasicString unicodeName((const char*) classId);
+       BasicString unicodeName(classId.mb_str());
        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
-               wxLogWarning("Cannot obtain CLSID from ProgID");
+               wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
                return FALSE;
        }
 
        if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
        {
-               wxLogWarning("Cannot find an active object");
+               wxLogWarning(wxT("Cannot find an active object"));
                return FALSE;
        }
        
        if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
        {
-               wxLogWarning("Cannot find IDispatch interface");
+               wxLogWarning(wxT("Cannot find IDispatch interface"));
                return FALSE;
        }
 
@@ -491,18 +495,18 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 
        CLSID clsId;
 
-       BasicString unicodeName((const char*) classId);
+       BasicString unicodeName(classId.mb_str());
        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
-               wxLogWarning("Cannot obtain CLSID from ProgID");
+               wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
                return FALSE;
        }
 
        // start a new copy of Excel, grab the IDispatch interface
        if (FAILED(CoCreateInstance(clsId, NULL, CLSCTX_LOCAL_SERVER, IID_IDispatch, (void**)&m_dispatchPtr))) 
        {
-               wxLogWarning("Cannot start an instance of this class.");
+               wxLogWarning(wxT("Cannot start an instance of this class."));
                return FALSE;
        }
        
@@ -521,17 +525,17 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 
     wxString type(variant.GetType());
 
-    if (type == "long")
+    if (type == wxT("long"))
     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
-    else if (type == "double")
+    else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;
         oleVariant.dblVal = variant.GetDouble();
     }
-    else if (type == "bool")
+    else if (type == wxT("bool"))
     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently
@@ -541,13 +545,15 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
         oleVariant.boolVal = variant.GetBool();
 #endif
     }
-    else if (type == "string")
+    else if (type == wxT("string"))
     {
         wxString str( variant.GetString() );
         oleVariant.vt = VT_BSTR;
         oleVariant.bstrVal = ConvertStringToOle(str);
     }
-    else if (type == "date")
+// 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() );
         oleVariant.vt = VT_DATE;
@@ -556,7 +562,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                                0, 0, 0, oleVariant.date))
                        return FALSE;
     }
-    else if (type == "time")
+    else if (type == wxT("time"))
     {
         wxTime time( variant.GetTime() );
         oleVariant.vt = VT_DATE;
@@ -565,12 +571,13 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }
-    else if (type == "void*")
+#endif
+    else if (type == wxT("void*"))
     {
         oleVariant.vt = VT_DISPATCH;
         oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
     }
-    else if (type == "list" || type == "stringlist")
+    else if (type == wxT("list") || type == wxT("stringlist"))
     {
         oleVariant.vt = VT_VARIANT | VT_ARRAY;
 
@@ -640,7 +647,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;
 
@@ -648,7 +656,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:
                {
@@ -663,14 +673,18 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
        case VT_BOOL:
                {
-#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
 #ifndef HAVE_BOOL // Can't use bool operator if no native bool type
                        variant = (long) (oleVariant.bool != 0);
 #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;
                }
@@ -724,7 +738,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                }
        default:
                {
-                       wxLogError("wxAutomationObject::ConvertOleToVariant: Unknown variant value type");
+                       wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
                        return FALSE;
                }
        }
@@ -741,7 +755,7 @@ static BSTR ConvertStringToOle(const wxString& str)
        for (i=0; i < len; i++)
                s[i*2] = str[i];
 */
-       BasicString bstr((const char*) str);
+       BasicString bstr(str.mb_str());
        return bstr.Get();
 }
 
@@ -1057,7 +1071,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
                }
                else 
                {
-                       wxLogWarning("ReleaseVariant: Array contains non-variant type");
+                       wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));
                }
                
                // Free the array itself.
@@ -1084,7 +1098,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
                                break;
                                
                        default:
-                               wxLogWarning("ReleaseVariant: Unknown type");
+                               wxLogWarning(wxT("ReleaseVariant: Unknown type"));
                                break;
                }
        }
@@ -1155,3 +1169,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
 
 #endif
 
+#endif // __WATCOMC__
+