・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / ObjectVector.h

diff --git a/ObjectVector.h b/ObjectVector.h
index 6acc11b..9af8b09 100644 (file)
--- a/ObjectVector.h
+++ b/ObjectVector.h
@@ -1,7 +1,6 @@
 // ObjectVector.h : CObjectVector \82Ì\90é\8c¾
 
-#ifndef __OBJECTVECTOR_H_
-#define __OBJECTVECTOR_H_
+#pragma once
 
 #include "resource.h"       // \83\81\83C\83\93 \83V\83\93\83{\83\8b
 #include <vector>
@@ -11,10 +10,10 @@ typedef vector<VARIANT> VariantVector;
 
 /////////////////////////////////////////////////////////////////////////////
 // CObjectVector
-class ATL_NO_VTABLE CObjectVector : 
+class ATL_NO_VTABLE CObjectVector :
        public CComObjectRootEx<CComSingleThreadModel>,
        public CComCoClass<CObjectVector, &CLSID_ObjectVector>,
-       public ISupportErrorInfo,
+       public ISupportErrorInfoImpl<&IID_IObjectVector>,
        public IDispatchImpl<IObjectVector, &IID_IObjectVector, &LIBID_SERAPHYSCRIPTTOOLSLib>
 {
 public:
@@ -28,20 +27,17 @@ public:
                Clear();
        }
 
-DECLARE_REGISTRY_RESOURCEID(IDR_OBJECTVECTOR)
+       DECLARE_REGISTRY_RESOURCEID(IDR_OBJECTVECTOR)
 
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+       DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(CObjectVector)
-       COM_INTERFACE_ENTRY(IObjectVector)
-       COM_INTERFACE_ENTRY(IDispatch)
-       COM_INTERFACE_ENTRY(ISupportErrorInfo)
-END_COM_MAP()
+       BEGIN_COM_MAP(CObjectVector)
+               COM_INTERFACE_ENTRY(IObjectVector)
+               COM_INTERFACE_ENTRY(IDispatch)
+               COM_INTERFACE_ENTRY(ISupportErrorInfo)
+       END_COM_MAP()
 
-// ISupportsErrorInfo
-       STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
-
-// IObjectVector
+       // IObjectVector
 public:
        STDMETHOD(MakeArray)(/*[out,retval]*/VARIANT* pVal);
        STDMETHOD(Merge)(/*[in]*/VARIANT unkVal);
@@ -59,5 +55,3 @@ public:
 protected:
        VariantVector m_vctVariant;
 };
-
-#endif //__OBJECTVECTOR_H_