・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / ObjectMap.h

diff --git a/ObjectMap.h b/ObjectMap.h
index 36d8527..76363a1 100644 (file)
--- a/ObjectMap.h
+++ b/ObjectMap.h
@@ -1,21 +1,20 @@
 // ObjectMap.h : CObjectMap \82Ì\90é\8c¾
 
-#ifndef __OBJECTMAP_H_
-#define __OBJECTMAP_H_
+#pragma once
 
 #include "resource.h"       // \83\81\83C\83\93 \83V\83\93\83{\83\8b
 #include <map>
 #include <string>
 using namespace std;
 
-typedef map<_bstr_t,VARIANT> VariantMap;
+typedef map<_bstr_t, VARIANT> VariantMap;
 
 /////////////////////////////////////////////////////////////////////////////
 // CObjectMap
-class ATL_NO_VTABLE CObjectMap : 
+class ATL_NO_VTABLE CObjectMap :
        public CComObjectRootEx<CComSingleThreadModel>,
        public CComCoClass<CObjectMap, &CLSID_ObjectMap>,
-       public ISupportErrorInfo,
+       public ISupportErrorInfoImpl<&IID_IObjectMap>,
        public IDispatchImpl<IObjectMap, &IID_IObjectMap, &LIBID_SERAPHYSCRIPTTOOLSLib>
 {
 public:
@@ -28,20 +27,17 @@ public:
                ATLTRACE("CObjectMap::FinalRelease\n");
        }
 
-DECLARE_REGISTRY_RESOURCEID(IDR_OBJECTMAP)
+       DECLARE_REGISTRY_RESOURCEID(IDR_OBJECTMAP)
 
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+       DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(CObjectMap)
-       COM_INTERFACE_ENTRY(IObjectMap)
-       COM_INTERFACE_ENTRY(IDispatch)
-       COM_INTERFACE_ENTRY(ISupportErrorInfo)
-END_COM_MAP()
+       BEGIN_COM_MAP(CObjectMap)
+               COM_INTERFACE_ENTRY(IObjectMap)
+               COM_INTERFACE_ENTRY(IDispatch)
+               COM_INTERFACE_ENTRY(ISupportErrorInfo)
+       END_COM_MAP()
 
-// ISupportsErrorInfo
-       STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
-
-// IObjectMap
+       // IObjectMap
 public:
        STDMETHOD(SaveProfile)(/*[in]*/IUnknown* punkVal);
        STDMETHOD(LoadProfile)(/*[in]*/IUnknown* punkVal);
@@ -60,5 +56,3 @@ public:
 protected:
        VariantMap m_mapVariant;
 };
-
-#endif //__OBJECTMAP_H_