UNICODEビルド、X64ビルドでコンパイルエラーが発生しないように修正した。

[seraphyscrtools/SeraphyScriptTools.git] / Control.h

diff --git a/Control.h b/Control.h
index 487a2bc..f23c635 100644 (file)
--- a/Control.h
+++ b/Control.h
@@ -10,7 +10,7 @@
 // CControl
 class ATL_NO_VTABLE CControl : 
        public CComObjectRootEx<CComSingleThreadModel>,
-//     public CComCoClass<CControl, &CLSID_Control>,
+       public CComCoClass<CControl, &CLSID_Control>,
        public ISupportErrorInfo,
        public IConnectionPointContainerImpl<CControl>,
        public IDispatchImpl<IControl, &IID_IControl, &LIBID_SERAPHYSCRIPTTOOLSLib>
@@ -34,32 +34,36 @@ public:
                m_nColumnCount = 0;
                m_dLastSortColumn = -1; //\8dÅ\8cã\82É\83\\81[\83g\82µ\82½\83J\83\89\83\80
        }
-       void SetParam(DWORD afterstyle,DWORD exstyle,LPCSTR classname,LPCSTR caption,DWORD style,int x,int y,int w,int h,int nID)
+
+       void SetParam(DWORD afterstyle, DWORD exstyle, LPCTSTR classname, LPCTSTR caption, DWORD style, int x, int y, int w, int h, int nID)
        {
-               CHAR tmp[64];
-               wsprintf(tmp,"OnCommand%d",nID);
+               TCHAR tmp[64];
+               wsprintf(tmp, _T("OnCommand%d"), nID);
                m_x = x;
                m_y = y;
                m_h = h;
                m_w = w;
-               m_exstyle   = exstyle;
-               m_style     = style;
-               lstrcpy(m_classname,classname);
-               lstrcpy(m_caption,caption);
-               m_nID       = nID;
+               m_exstyle = exstyle;
+               m_style   = style;
+               lstrcpy(m_classname, classname);
+               lstrcpy(m_caption, caption);
+               m_nID  = nID;
                m_bstrClassEvent = tmp;
                m_hWnd = NULL;
                m_hParent = NULL;
                m_afterstyle = afterstyle;
        }
+
        HWND GetHWnd()
        {
                return m_hWnd;
        }
+
        void Redraw()
        {
-               RedrawWindow(m_hWnd,NULL,NULL,RDW_ERASE|RDW_FRAME|RDW_INTERNALPAINT|RDW_INVALIDATE);
+               RedrawWindow(m_hWnd, NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INTERNALPAINT | RDW_INVALIDATE);
        }
+
        void SetFont(HFONT hFont)
        {
                if(m_hWnd){
@@ -183,7 +187,7 @@ protected:
        VARTYPE m_typCompare;
        int m_dLastSortColumn;
        int m_nColumnCount;
-       LPSTR ConvertVariantToString(VARIANT text);
+       HRESULT ConvertVariantToString(VARIANT text, ATL::CString &retval);
 };
 
 #endif //__CONTROL_H_