</Midl>\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
</Midl>\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>Use</PrecompiledHeader>\r
<ClCompile>\r
<Optimization>MaxSpeed</Optimization>\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<StringPooling>true</StringPooling>\r
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
<ClCompile>\r
<Optimization>MaxSpeed</Optimization>\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<StringPooling>true</StringPooling>\r
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
</Midl>\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
</Midl>\r
<ClCompile>\r
<Optimization>Disabled</Optimization>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>Use</PrecompiledHeader>\r
<ClCompile>\r
<Optimization>MaxSpeed</Optimization>\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<StringPooling>true</StringPooling>\r
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
<ClCompile>\r
<Optimization>MaxSpeed</Optimization>\r
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
- <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<StringPooling>true</StringPooling>\r
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
--- /dev/null
+#pragma once\r
+\r
+inline void DDX_Check(CDataExchange* pDX, int nIDC, bool& value)\r
+{\r
+ BOOL BOOL_value = value;\r
+ DDX_Check(pDX, nIDC, BOOL_value);\r
+ value = !!BOOL_value;\r
+}\r
+\r
+inline void DDX_Radio(CDataExchange* pDX, int nIDC, bool& value)\r
+{\r
+ BOOL BOOL_value = value;\r
+ DDX_Radio(pDX, nIDC, BOOL_value);\r
+ value = !!BOOL_value;\r
+}\r
+\r
+inline void DDX_Text(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
+{\r
+ CString cstrValue = value.c_str();\r
+ DDX_Text(pDX, nIDC, cstrValue);\r
+ value = cstrValue;\r
+}\r
+\r
+inline void DDX_CBString(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
+{\r
+ CString cstrValue = value.c_str();\r
+ DDX_CBString(pDX, nIDC, cstrValue);\r
+ value = cstrValue;\r
+}\r
+\r
+inline void DDX_CBStringExact(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
+{\r
+ CString cstrValue = value.c_str();\r
+ DDX_CBStringExact(pDX, nIDC, cstrValue);\r
+ value = cstrValue;\r
+}\r
+\r
#pragma once\r
\r
-#include "UnicodeString.h"\r
-\r
-\r
inline void DDX_Check(CDataExchange* pDX, int nIDC, bool& value)\r
{\r
BOOL BOOL_value = value;\r
value = !!BOOL_value;\r
}\r
\r
-inline void DDX_Text(CDataExchange* pDX, int nIDC, String& value)\r
+inline void DDX_Text(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
{\r
CString cstrValue = value.c_str();\r
DDX_Text(pDX, nIDC, cstrValue);\r
value = cstrValue;\r
}\r
\r
-inline void DDX_CBString(CDataExchange* pDX, int nIDC, String& value)\r
+inline void DDX_CBString(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
{\r
CString cstrValue = value.c_str();\r
DDX_CBString(pDX, nIDC, cstrValue);\r
value = cstrValue;\r
}\r
\r
-inline void DDX_CBStringExact(CDataExchange* pDX, int nIDC, String& value)\r
+inline void DDX_CBStringExact(CDataExchange* pDX, int nIDC, std::basic_string<TCHAR>& value)\r
{\r
CString cstrValue = value.c_str();\r
DDX_CBStringExact(pDX, nIDC, cstrValue);\r