・ MBCS->Unicode対応

[seraphyscrtools/SeraphyScriptTools.git] / StdAfx.h

diff --git a/StdAfx.h b/StdAfx.h
index f4a5b38..5b830dd 100644 (file)
--- a/StdAfx.h
+++ b/StdAfx.h
@@ -2,23 +2,41 @@
 //            \82Ü\82½\82Í\8eQ\8fÆ\89ñ\90\94\82ª\91½\82­\81A\82©\82Â\82 \82Ü\82è\95Ï\8dX\82³\82ê\82È\82¢
 //            \83v\83\8d\83W\83F\83N\83g\90ê\97p\82Ì\83C\83\93\83N\83\8b\81[\83h \83t\83@\83C\83\8b\82ð\8bL\8fq\82µ\82Ü\82·\81B
 
-#if !defined(AFX_STDAFX_H__8CB29832_BD58_4AC5_92EB_DB8B53DF0C73__INCLUDED_)
-#define AFX_STDAFX_H__8CB29832_BD58_4AC5_92EB_DB8B53DF0C73__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #define STRICT
+
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
+
 #define _ATL_APARTMENT_THREADED
 
+//#define _ATL_NO_AUTOMATIC_NAMESPACE
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS     // \88ê\95\94\82Ì CString \83R\83\93\83X\83g\83\89\83N\83^\82Í\96¾\8e¦\93I\82Å\82·\81B
+
+// Enabling Visual Style
+#define ISOLATION_AWARE_ENABLED 1
+
+#ifdef _UNICODE
+#if defined _M_IX86
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_IA64
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_X64
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#else
+#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#endif
+#endif 
+
 #include <atlbase.h>
+
 // CComModule \83N\83\89\83X\82©\82ç\94h\90¶\82µ\82½\83N\83\89\83X\82ð\8eg\97p\82µ\82Ä\81A\83I\81[\83o\81[\83\89\83C\83h\82·\82é\8fê\8d\87
 // _Module \82Ì\96¼\91O\82Í\95Ï\8dX\82µ\82È\82¢\82Å\82­\82¾\82³\82¢\81B
-extern CComModule _Module;
+extern ATL::CComModule _Module;
+
 #include <atlcom.h>
 #include <atlctl.h>
 #include <atlstr.h>
@@ -32,7 +50,13 @@ extern CComModule _Module;
 #define WM_MOVENEXT_OVERLAPPED (WM_USER + 100)
 #define WM_KEYDOWN_EX (WM_USER + 101)
 
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ \82Í\91O\8ds\82Ì\92¼\91O\82É\92Ç\89Á\82Ì\90é\8c¾\82ð\91}\93ü\82µ\82Ü\82·\81B
+#define VB_TRUE -1
+#define        VB_FALSE 0
 
-#endif // !defined(AFX_STDAFX_H__8CB29832_BD58_4AC5_92EB_DB8B53DF0C73__INCLUDED)
+/*
+#if defined(_DEBUG)
+#define ATLTRACE(mes) OutputDebugString(mes)
+#else
+#define ATLTRACE(mes)
+#endif
+*/