editlib: crystaledit component should not depend on WinMerge sources.

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
index 6463916..3e71382 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
@@ -162,7 +162,7 @@
     </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
@@ -201,7 +201,7 @@
     </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
@@ -240,7 +240,7 @@
     <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
@@ -279,7 +279,7 @@
     <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
@@ -317,7 +317,7 @@
     </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
@@ -357,7 +357,7 @@
     </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
@@ -397,7 +397,7 @@
     <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
@@ -437,7 +437,7 @@
     <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

diff --git a/Externals/crystaledit/editlib/DDXHelper.h b/Externals/crystaledit/editlib/DDXHelper.h
new file mode 100644 (file)
index 0000000..de0a808
--- /dev/null
+++ b/Externals/crystaledit/editlib/DDXHelper.h
@@ -0,0 +1,37 @@
+#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

diff --git a/Src/DDXHelper.h b/Src/DDXHelper.h
index 90899c5..de0a808 100644 (file)
--- a/Src/DDXHelper.h
+++ b/Src/DDXHelper.h
@@ -1,8 +1,5 @@
 #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
@@ -17,21 +14,21 @@ inline void DDX_Radio(CDataExchange* pDX, int nIDC, bool& value)
        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