editlib: Implement Marker feature (WIP)

WinMerge · Aug 28, 2017 · c1d66d6 · c1d66d6
1 parent 5863ebf
commit c1d66d6
Show file tree

Hide file tree

Showing 65 changed files with 4,888 additions and 2,632 deletions.
diff --git a/Externals/crystaledit/Sample/Sample.rc b/Externals/crystaledit/Sample/Sample.rc
@@ -212,6 +212,7 @@ BEGIN
     "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL
     "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL
+    "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL
     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT
     VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL

diff --git a/Externals/crystaledit/Sample/SampleDoc.cpp b/Externals/crystaledit/Sample/SampleDoc.cpp
@@ -44,11 +44,13 @@ CSampleDoc::CSampleDoc() : m_xTextBuffer(this)
    _tcscpy(m_lf.lfFaceName, _T("Courier New"));
 
 	m_pSyntaxColors = new SyntaxColors();
+	m_pMarkers = new CCrystalTextMarkers();
 }
 
 CSampleDoc::~CSampleDoc()
 {
 	delete m_pSyntaxColors;
+	delete m_pMarkers;
 }
 
 BOOL CSampleDoc::OnNewDocument()

diff --git a/Externals/crystaledit/Sample/SampleDoc.h b/Externals/crystaledit/Sample/SampleDoc.h
@@ -11,6 +11,7 @@
 
 #include "CCrystalTextBuffer.h"
 #include "SyntaxColors.h"
+#include "CCrystalTextMarkers.h"
 
 class CSampleDoc : public CDocument
 {
@@ -33,6 +34,7 @@ class CSampleDoc : public CDocument
 	CSampleTextBuffer m_xTextBuffer;
 	LOGFONT m_lf;
 	SyntaxColors *m_pSyntaxColors;
+	CCrystalTextMarkers *m_pMarkers;
 
 // Operations
 public:

diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -22,29 +22,30 @@
     <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>
     <RootNamespace>SampleStatic</RootNamespace>
     <Keyword>MFCProj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -288,6 +289,7 @@
     <ClCompile Include="..\editlib\batch.cpp" />
     <ClCompile Include="..\editlib\ccrystaleditview.cpp" />
     <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />
+    <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />
     <ClCompile Include="..\editlib\ccrystaltextview.cpp" />
     <ClCompile Include="..\editlib\ccrystaltextview2.cpp" />
     <ClCompile Include="..\editlib\ceditreplacedlg.cpp" />
@@ -369,6 +371,7 @@
   <ItemGroup>
     <ClInclude Include="..\editlib\ccrystaleditview.h" />
     <ClInclude Include="..\editlib\ccrystaltextbuffer.h" />
+    <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />
     <ClInclude Include="..\editlib\ccrystaltextview.h" />
     <ClInclude Include="..\editlib\ceditreplacedlg.h" />
     <ClInclude Include="..\editlib\cfindtextdlg.h" />

diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vcxproj.filters
@@ -216,6 +216,9 @@
     <ClCompile Include="..\editlib\go.cpp">
       <Filter>editlib\parsers</Filter>
     </ClCompile>
+    <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp">
+      <Filter>editlib</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Sample.rc">
@@ -325,6 +328,9 @@
     <ClInclude Include="..\editlib\wispelld.h">
       <Filter>editlib</Filter>
     </ClInclude>
+    <ClInclude Include="..\editlib\ccrystaltextmarkers.h">
+      <Filter>editlib</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\mg_icons.bmp">

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2015.sln b/Externals/crystaledit/Sample/SampleStatic.vs2015.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		Unicode Debug|Win32 = Unicode Debug|Win32
+		Unicode Release|Win32 = Unicode Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Debug|Win32.Build.0 = Debug|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|Win32.ActiveCfg = Release|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|Win32.Build.0 = Release|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6D875F13-7AF3-4BE0-B667-DD8052CBF835}
+	EndGlobalSection
+EndGlobal