・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / Draw.h

diff --git a/Draw.h b/Draw.h
index ec45291..b73ceae 100644 (file)
--- a/Draw.h
+++ b/Draw.h
@@ -1,7 +1,6 @@
 // Draw.h : CCanvas \82Ì\90é\8c¾
 
-#ifndef __DRAW_H_
-#define __DRAW_H_
+#pragma once
 
 #include "resource.h"       // \83\81\83C\83\93 \83V\83\93\83{\83\8b
 #include "layer.h"
@@ -11,7 +10,7 @@
 
 #define MAXLAYER 256
 
-class ATL_NO_VTABLE CCanvas : 
+class ATL_NO_VTABLE CCanvas :
        public CComObjectRootEx<CComSingleThreadModel>,
        public CComCoClass<CCanvas, &CLSID_Canvas>,
        public ISupportErrorInfo,
@@ -25,15 +24,15 @@ public:
                m_hParent = NULL;
                // \88ó\8dü\8aÖ\98A
                m_pPrinterDeviceMode = NULL;
-               m_marginWidth    = 150; // 1.5Cm\82Ì\83}\81[\83W\83\93
-               m_marginHeight   = 150;
+               m_marginWidth = 150; // 1.5Cm\82Ì\83}\81[\83W\83\93
+               m_marginHeight = 150;
                // \83\8c\83C\83\84\81[\82Ì\8f\89\8aú\89»
                int i;
-               for(i=0 ; i<MAXLAYER ; i++){
-                       if(m_pComLayer[i]->CreateInstance(&m_pComLayer[i]) == S_OK){
+               for (i = 0; i < MAXLAYER; i++) {
+                       if (m_pComLayer[i]->CreateInstance(&m_pComLayer[i]) == S_OK) {
                                m_pComLayer[i]->AddRef();
                        }
-                       else{
+                       else {
                                // \90¶\90¬\82É\8e¸\94s\81B
                                m_pComLayer[i] = NULL;
                        }
@@ -41,29 +40,29 @@ public:
        }
        void CCanvas::FinalRelease();
 
-DECLARE_REGISTRY_RESOURCEID(IDR_CANVAS)
+       DECLARE_REGISTRY_RESOURCEID(IDR_CANVAS)
 
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+       DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-BEGIN_COM_MAP(CCanvas)
-       COM_INTERFACE_ENTRY(ICanvas)
-       COM_INTERFACE_ENTRY(IDispatch)
-       COM_INTERFACE_ENTRY(ISupportErrorInfo)
-       COM_INTERFACE_ENTRY(IConnectionPointContainer)
-END_COM_MAP()
-BEGIN_CONNECTION_POINT_MAP(CCanvas)
-END_CONNECTION_POINT_MAP()
+       BEGIN_COM_MAP(CCanvas)
+               COM_INTERFACE_ENTRY(ICanvas)
+               COM_INTERFACE_ENTRY(IDispatch)
+               COM_INTERFACE_ENTRY(ISupportErrorInfo)
+               COM_INTERFACE_ENTRY(IConnectionPointContainer)
+       END_COM_MAP()
+       BEGIN_CONNECTION_POINT_MAP(CCanvas)
+       END_CONNECTION_POINT_MAP()
 
 
-// ISupportsErrorInfo
+       // ISupportsErrorInfo
        STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
-// ICanvas
+       // ICanvas
 public:
        STDMETHOD(LoadPicture)(/*[in]*/VARIANT path,/*[out,retval]*/VARIANT* punkVal);
        void AttachOwner(HWND hParent);
        void DetachOwner();
-       void Draw(HDC hdc,RECT& rt);
+       void Draw(HDC hdc, RECT& rt);
        STDMETHOD(get_Layer)(/*[in]*/VARIANT varLay, /*[out, retval]*/ VARIANT *pVal);
        STDMETHOD(Print)();
        STDMETHOD(GetPrinterDefault)(/*[in,optional]*/VARIANT name);
@@ -81,5 +80,3 @@ protected:
        BOOL PrintCore(CDC dc);
        HWND m_hParent;
 };
-
-#endif //__DRAW_H_