・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / Event.h

diff --git a/Event.h b/Event.h
index 9f41f78..386b10a 100644 (file)
--- a/Event.h
+++ b/Event.h
@@ -1,16 +1,15 @@
 // Event.h : CEvent \82Ì\90é\8c¾
 
-#ifndef __EVENT_H_
-#define __EVENT_H_
+#pragma once
 
 #include "resource.h"       // \83\81\83C\83\93 \83V\83\93\83{\83\8b
 
 /////////////////////////////////////////////////////////////////////////////
 // CEvent
-class ATL_NO_VTABLE CEvent : 
+class ATL_NO_VTABLE CEvent :
        public CComObjectRootEx<CComSingleThreadModel>,
-//     public CComCoClass<CEvent, &CLSID_Event>,
-       public ISupportErrorInfo,
+       public CComCoClass<CEvent, &CLSID_Event>,
+       public ISupportErrorInfoImpl<&IID_IEvent>,
        public IConnectionPointContainerImpl<CEvent>,
        public IDispatchImpl<IEvent, &IID_IEvent, &LIBID_SERAPHYSCRIPTTOOLSLib>
 {
@@ -18,33 +17,29 @@ public:
        CEvent()
        {
                m_message = 0;
-               m_param   = 0;
-               m_lparam  = 0;
-               m_time    = 0.;
-               m_ptDP.x  = 0;
-               m_ptDP.y  = 0;
-               m_ptLP.x  = 0;
-               m_ptLP.y  = 0;
+               m_param = 0;
+               m_lparam = 0;
+               m_time = 0.;
+               m_ptDP.x = 0;
+               m_ptDP.y = 0;
+               m_ptLP.x = 0;
+               m_ptLP.y = 0;
        }
 
-//DECLARE_REGISTRY_RESOURCEID(IDR_EVENT)
+       //DECLARE_REGISTRY_RESOURCEID(IDR_EVENT)
 
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+       DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(CEvent)
-       COM_INTERFACE_ENTRY(IEvent)
-       COM_INTERFACE_ENTRY(IDispatch)
-       COM_INTERFACE_ENTRY(ISupportErrorInfo)
-       COM_INTERFACE_ENTRY(IConnectionPointContainer)
-END_COM_MAP()
-BEGIN_CONNECTION_POINT_MAP(CEvent)
-END_CONNECTION_POINT_MAP()
+       BEGIN_COM_MAP(CEvent)
+               COM_INTERFACE_ENTRY(IEvent)
+               COM_INTERFACE_ENTRY(IDispatch)
+               COM_INTERFACE_ENTRY(ISupportErrorInfo)
+               COM_INTERFACE_ENTRY(IConnectionPointContainer)
+       END_COM_MAP()
+       BEGIN_CONNECTION_POINT_MAP(CEvent)
+       END_CONNECTION_POINT_MAP()
 
-
-// ISupportsErrorInfo
-       STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
-
-// IEvent
+       // IEvent
 public:
        STDMETHOD(IsKeydown2)(/*[out,retval]*/BOOL* pResult);
        STDMETHOD(get_DPosY)(/*[out, retval]*/ long *pVal);
@@ -68,15 +63,18 @@ public:
        STDMETHOD(IsRClick)(/*[out,retval]*/BOOL* pResult);
        STDMETHOD(IsClick)(/*[out,retval]*/BOOL* pResult);
        STDMETHOD(IsMouseMove)(/*[out,retval]*/BOOL* pResult);
-       short GetMessage(){     return m_message; }
-       short GetParam()  { return m_param;   }
-       DWORD GetLParam() { return m_lparam; }
-       void SetData(short message,short wParam,DWORD lParam,POINT& pt,POINT& lp);
        STDMETHOD(get_time)(/*[out, retval]*/ DATE *pVal);
        STDMETHOD(get_PosY)(/*[out, retval]*/ double *pVal);
        STDMETHOD(get_PosX)(/*[out, retval]*/ double *pVal);
        STDMETHOD(get_Parameter)(/*[out, retval]*/ short *pVal);
        STDMETHOD(get_Message)(/*[out, retval]*/ short *pVal);
+
+public:
+       short GetMessage(){ return m_message; }
+       short GetParam()  { return m_param; }
+       DWORD GetLParam() { return m_lparam; }
+       void SetData(short message, short wParam, DWORD lParam, POINT& pt, POINT& lp);
+
 protected:
        POINT m_ptDP;
        POINT m_ptLP;
@@ -85,5 +83,3 @@ protected:
        DWORD m_lparam;
        double m_time;
 };
-
-#endif //__EVENT_H_