A few compile fixes,

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

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index f8bac3d40085236332d47d5a5049e6de8fa268da..c838b38d78a2f0ea1562ba99903d2062a1bb829a 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -29,6 +29,10 @@
 
 #include "wx/msw/private.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>
 


@@ -423,7 +427,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() == _T("void*"))

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


@@ -459,23 +463,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(_T("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(_T("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(_T("Cannot find IDispatch interface"));

                return FALSE;
        }
 
                return FALSE;
        }
 


@@ -491,18 +495,18 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 
        CLSID clsId;
 
 
        CLSID clsId;
 

-       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(_T("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(_T("Cannot start an instance of this class."));

                return FALSE;
        }
        
                return FALSE;
        }
        


@@ -521,17 +525,17 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 
     wxString type(variant.GetType());
 
 
     wxString type(variant.GetType());
 

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

     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }

-    else if (type == "double")
+    else if (type == _T("double"))

     {
         oleVariant.vt = VT_R8;
         oleVariant.dblVal = variant.GetDouble();
     }
     {
         oleVariant.vt = VT_R8;
         oleVariant.dblVal = variant.GetDouble();
     }

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

     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently
     {
         oleVariant.vt = VT_BOOL;
         // 'bool' required for VC++ 4 apparently


@@ -541,13 +545,13 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
         oleVariant.boolVal = variant.GetBool();
 #endif
     }
         oleVariant.boolVal = variant.GetBool();
 #endif
     }

-    else if (type == "string")
+    else if (type == _T("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")
+    else if (type == _T("date"))

     {
         wxDate date( variant.GetDate() );
         oleVariant.vt = VT_DATE;
     {
         wxDate date( variant.GetDate() );
         oleVariant.vt = VT_DATE;


@@ -556,7 +560,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                                0, 0, 0, oleVariant.date))
                        return FALSE;
     }
                                0, 0, 0, oleVariant.date))
                        return FALSE;
     }

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

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


@@ -565,12 +569,12 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }

-    else if (type == "void*")
+    else if (type == _T("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 == _T("list") || type == _T("stringlist"))

     {
         oleVariant.vt = VT_VARIANT | VT_ARRAY;
 
     {
         oleVariant.vt = VT_VARIANT | VT_ARRAY;
 


@@ -724,7 +728,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                }
        default:
                {
                }
        default:
                {

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

                        return FALSE;
                }
        }
                        return FALSE;
                }
        }


@@ -741,7 +745,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();
 }
 


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

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

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


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

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

                                break;
                }
        }
                                break;
                }
        }