Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index e16be59a3258e1d10e03024099f1a9edde31fe04..e29b9ab51e5e28b7443bbed8b1bdee7688d82efa 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -21,13 +21,50 @@
 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"

+
+#include <math.h>
+#include <time.h>
+
+// Watcom C++ gives a linker error if this is compiled in.
+#ifndef __WATCOMC__
+

 #include "wx/msw/ole/automtn.h"
 
 #include "wx/msw/ole/automtn.h"
 

-#include <windows.h>
+#include "wx/msw/private.h"
+
+#include <wtypes.h>
+#include <unknwn.h>
+#include <ole2.h>
+#define _huge

 #include <ole2ver.h>
 #include <oleauto.h>
 #include <ole2ver.h>
 #include <oleauto.h>

-#include <math.h>
-#include <time.h>
+
+// wrapper around BSTR type (by Vadim Zeitlin)
+
+class WXDLLEXPORT BasicString
+{
+public:
+  // ctors & dtor
+  BasicString(const char *sz);
+ ~BasicString();
+
+  // accessors
+    // just get the string
+  operator BSTR() const { return m_wzBuf; }
+    // retrieve a copy of our string - caller must SysFreeString() it later!
+  BSTR Get() const { return SysAllocString(m_wzBuf); }
+
+private:
+  // @@@ not implemented (but should be)
+  BasicString(const BasicString&);
+  BasicString& operator=(const BasicString&);
+
+  OLECHAR *m_wzBuf;     // actual string
+};
+
+// Convert variants
+static bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
+static bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;

 
 // Convert string to Unicode
 static BSTR ConvertStringToOle(const wxString& str);
 
 // Convert string to Unicode
 static BSTR ConvertStringToOle(const wxString& str);


@@ -50,9 +87,6 @@ static int rgMonthDays[13] =
 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);
 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);

-static void TmConvertToStandardFormat(struct tm& tmSrc);
-static double DoubleFromDate(DATE dt);
-static DATE DateFromDouble(double dbl);

 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;
 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;


@@ -396,7 +430,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
        wxVariant retVariant;
        if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
        {
        wxVariant retVariant;
        if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
        {

-               if (retVariant.GetType() == "void*")
+               if (retVariant.GetType() == wxT("void*"))

                {
                        return (WXIDISPATCH*) retVariant.GetVoidPtr();
                }
                {
                        return (WXIDISPATCH*) retVariant.GetVoidPtr();
                }


@@ -432,23 +466,23 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
        CLSID clsId;
        IUnknown * pUnk = NULL;
 
        CLSID clsId;
        IUnknown * pUnk = NULL;
 

-       BasicString unicodeName((const char*) classId);
+       BasicString unicodeName(classId.mb_str());

        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
        
        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)))
        {
                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)
        {
                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;
        }
 
                return FALSE;
        }
 


@@ -463,20 +497,19 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
                return FALSE;
 
        CLSID clsId;
                return FALSE;
 
        CLSID clsId;

-       IUnknown * pUnk = NULL;

 
 

-       BasicString unicodeName((const char*) classId);
+       BasicString unicodeName(classId.mb_str());

        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
        
        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))) 
        {
                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;
        }
        
                return FALSE;
        }
        


@@ -484,7 +517,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 }
 
 
 }
 
 

-bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
+bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)

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


@@ -495,32 +528,35 @@ bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTAR
 
     wxString type(variant.GetType());
 
 
     wxString type(variant.GetType());
 

-    if (type == "long")
+    if (type == wxT("long"))

     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
     {
         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();
     }
     {
         oleVariant.vt = VT_R8;
         oleVariant.dblVal = variant.GetDouble();
     }

-    else if (type == "bool")
+    else if (type == wxT("bool"))

     {
         oleVariant.vt = VT_BOOL;
     {
         oleVariant.vt = VT_BOOL;

-#ifdef __WATCOMC__
+        // 'bool' required for VC++ 4 apparently
+#if defined(__WATCOMC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1000))

         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();
 #endif
     }
         oleVariant.bool = variant.GetBool();
 #else
         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);
     }
     {
         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;
     {
         wxDate date( variant.GetDate() );
         oleVariant.vt = VT_DATE;


@@ -529,7 +565,7 @@ bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTAR
                                0, 0, 0, oleVariant.date))
                        return FALSE;
     }
                                0, 0, 0, oleVariant.date))
                        return FALSE;
     }

-    else if (type == "time")
+    else if (type == wxT("time"))

     {
         wxTime time( variant.GetTime() );
         oleVariant.vt = VT_DATE;
     {
         wxTime time( variant.GetTime() );
         oleVariant.vt = VT_DATE;


@@ -538,12 +574,13 @@ bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTAR
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }
                        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();
     }
     {
         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;
 
     {
         oleVariant.vt = VT_VARIANT | VT_ARRAY;
 


@@ -601,7 +638,7 @@ bool wxAutomationObject::ConvertVariantToOle(const wxVariant& variant, VARIANTAR
 #define VT_TYPEMASK 0xfff
 #endif
 
 #define VT_TYPEMASK 0xfff
 #endif
 

-bool wxAutomationObject::ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
+bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)

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


@@ -636,8 +673,12 @@ bool wxAutomationObject::ConvertOleToVariant(const VARIANTARG& oleVariant, wxVar
 
        case VT_BOOL:
                {
 
        case VT_BOOL:
                {

-#ifdef __WATCOMC__
+#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);
                        variant = (bool) (oleVariant.bool != 0);

+#endif

 #else
                        variant = (bool) (oleVariant.boolVal != 0);
 #endif
 #else
                        variant = (bool) (oleVariant.boolVal != 0);
 #endif


@@ -693,7 +734,7 @@ bool wxAutomationObject::ConvertOleToVariant(const VARIANTARG& oleVariant, wxVar
                }
        default:
                {
                }
        default:
                {

-                       wxLogError("wxAutomationObject::ConvertOleToVariant: Unknown variant value type");
+                       wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));

                        return FALSE;
                }
        }
                        return FALSE;
                }
        }


@@ -710,7 +751,7 @@ static BSTR ConvertStringToOle(const wxString& str)
        for (i=0; i < len; i++)
                s[i*2] = str[i];
 */
        for (i=0; i < len; i++)
                s[i*2] = str[i];
 */

-       BasicString bstr((const char*) str);
+       BasicString bstr(str.mb_str());

        return bstr.Get();
 }
 
        return bstr.Get();
 }
 


@@ -718,7 +759,7 @@ static wxString ConvertStringFromOle(BSTR bStr)
 {
        int len = SysStringLen(bStr) + 1;
        char    *buf = new char[len];
 {
        int len = SysStringLen(bStr) + 1;
        char    *buf = new char[len];

-       int i = wcstombs( buf, bStr, len);
+       (void)wcstombs( buf, bStr, len);

 
        wxString str(buf);
        delete[] buf;
 
        wxString str(buf);
        delete[] buf;


@@ -734,7 +775,11 @@ BasicString::BasicString(const char *sz)
 {
   // get the size of required buffer
   UINT lenAnsi = strlen(sz);
 {
   // get the size of required buffer
   UINT lenAnsi = strlen(sz);

+  #ifdef __MWERKS__
+  UINT lenWide = lenAnsi * 2 ;
+  #else

   UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
   UINT lenWide = mbstowcs(NULL, sz, lenAnsi);

+  #endif

 
   if ( lenWide > 0 ) {
     m_wzBuf = new OLECHAR[lenWide + 1];
 
   if ( lenWide > 0 ) {
     m_wzBuf = new OLECHAR[lenWide + 1];


@@ -930,6 +975,8 @@ DoTime:
        return TRUE;
 }
 
        return TRUE;
 }
 

+// this function is not used
+#if 0

 void TmConvertToStandardFormat(struct tm& tmSrc)
 {
        // Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
 void TmConvertToStandardFormat(struct tm& tmSrc)
 {
        // Convert afx internal tm to format expected by runtimes (_tcsftime, etc)


@@ -962,6 +1009,7 @@ DATE DateFromDouble(double dbl)
        double temp = floor(dbl); // dbl is now whole part
        return temp + (temp - dbl);
 }
        double temp = floor(dbl); // dbl is now whole part
        return temp + (temp - dbl);
 }

+#endif // 0

 
 /*
  *  ClearVariant
 
 /*
  *  ClearVariant


@@ -1019,7 +1067,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
                }
                else 
                {
                }
                else 
                {

-                       wxLogWarning("ReleaseVariant: Array contains non-variant type");
+                       wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));

                }
                
                // Free the array itself.
                }
                
                // Free the array itself.


@@ -1046,7 +1094,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
                                break;
                                
                        default:
                                break;
                                
                        default:

-                               wxLogWarning("ReleaseVariant: Unknown type");
+                               wxLogWarning(wxT("ReleaseVariant: Unknown type"));

                                break;
                }
        }
                                break;
                }
        }


@@ -1117,3 +1165,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
 
 #endif
 
 
 #endif
 

+#endif // __WATCOMC__
+