WIP

WinMerge · Jun 5, 2024 · 8bacafa · 8bacafa
1 parent d118721
commit 8bacafa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 137 deletions.
diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vcxproj
@@ -233,7 +233,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -326,17 +325,10 @@
       <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-<<<<<<< HEAD:Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <TargetMachine>MachineX86</TargetMachine>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-=======
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
->>>>>>> master:Externals/crystaledit/Sample/SampleStatic.vcxproj
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -434,12 +426,8 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-<<<<<<< HEAD:Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-=======
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
->>>>>>> master:Externals/crystaledit/Sample/SampleStatic.vcxproj
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -537,18 +525,11 @@
       <AdditionalLibraryDirectories>..\output;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-<<<<<<< HEAD:Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention />
-      <TargetMachine>MachineX86</TargetMachine>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
-=======
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
->>>>>>> master:Externals/crystaledit/Sample/SampleStatic.vcxproj
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -612,85 +593,6 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-<<<<<<< HEAD:Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
-    <ClCompile Include="..\editlib\parsers\asp.cpp" />
-    <ClCompile Include="..\editlib\parsers\basic.cpp" />
-    <ClCompile Include="..\editlib\parsers\batch.cpp" />
-    <ClCompile Include="..\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\editlib\parsers\crystallineparser.cpp" />
-    <ClCompile Include="..\editlib\renderers\ccrystalrendererdirectwrite.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\editlib\renderers\ccrystalrenderergdi.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextview.cpp" />
-    <ClCompile Include="..\editlib\ccrystaltextview2.cpp" />
-    <ClCompile Include="..\editlib\dialogs\ctextmarkerdlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\ceditreplacedlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\cfindtextdlg.cpp" />
-    <ClCompile Include="..\editlib\dialogs\chcondlg.cpp" />
-    <ClCompile Include="..\editlib\parsers\cplusplus.cpp" />
-    <ClCompile Include="..\editlib\utils\cregexp.cpp" />
-    <ClCompile Include="..\editlib\crystaleditviewex.cpp" />
-    <ClCompile Include="..\editlib\crystalparser.cpp" />
-    <ClCompile Include="..\editlib\crystaltextblock.cpp" />
-    <ClCompile Include="..\editlib\utils\cs2cs.cpp" />
-    <ClCompile Include="..\editlib\parsers\csharp.cpp" />
-    <ClCompile Include="..\editlib\parsers\css.cpp" />
-    <ClCompile Include="..\editlib\parsers\dcl.cpp" />
-    <ClCompile Include="..\editlib\edtlib.cpp" />
-    <ClCompile Include="..\editlib\utils\DpiAware.cpp" />
-    <ClCompile Include="..\editlib\utils\filesup.cpp" />
-    <ClCompile Include="..\editlib\parsers\fortran.cpp" />
-    <ClCompile Include="..\editlib\utils\fpattern.cpp" />
-    <ClCompile Include="..\editlib\parsers\go.cpp" />
-    <ClCompile Include="..\editlib\dialogs\gotodlg.cpp" />
-    <ClCompile Include="..\editlib\parsers\html.cpp" />
-    <ClCompile Include="..\editlib\parsers\isx.cpp" />
-    <ClCompile Include="..\editlib\utils\hqbitmap.cpp" />
-    <ClCompile Include="..\editlib\utils\icu.cpp" />
-    <ClCompile Include="..\editlib\parsers\ini.cpp" />
-    <ClCompile Include="..\editlib\parsers\innosetup.cpp" />
-    <ClCompile Include="..\editlib\parsers\is.cpp" />
-    <ClCompile Include="..\editlib\parsers\java.cpp" />
-    <ClCompile Include="..\editlib\LineInfo.cpp" />
-    <ClCompile Include="..\editlib\parsers\lisp.cpp" />
-    <ClCompile Include="..\editlib\parsers\lua.cpp" />
-    <ClCompile Include="..\editlib\dialogs\memcombo.cpp" />
-    <ClCompile Include="..\editlib\parsers\nsis.cpp" />
-    <ClCompile Include="..\editlib\parsers\pascal.cpp" />
-    <ClCompile Include="..\editlib\parsers\perl.cpp" />
-    <ClCompile Include="..\editlib\parsers\php.cpp" />
-    <ClCompile Include="..\editlib\parsers\plain.cpp" />
-    <ClCompile Include="..\editlib\parsers\po.cpp" />
-    <ClCompile Include="..\editlib\parsers\powershell.cpp" />
-    <ClCompile Include="..\editlib\parsers\python.cpp" />
-    <ClCompile Include="..\editlib\utils\MDITileLayout.cpp" />
-    <ClCompile Include="..\editlib\utils\registry.cpp" />
-    <ClCompile Include="..\editlib\parsers\rexx.cpp" />
-    <ClCompile Include="..\editlib\parsers\rsrc.cpp" />
-    <ClCompile Include="..\editlib\parsers\ruby.cpp" />
-    <ClCompile Include="..\editlib\parsers\rust.cpp" />
-    <ClCompile Include="..\editlib\parsers\sgml.cpp" />
-    <ClCompile Include="..\editlib\parsers\sh.cpp" />
-    <ClCompile Include="..\editlib\parsers\siod.cpp" />
-    <ClCompile Include="..\editlib\parsers\sql.cpp" />
-    <ClCompile Include="..\editlib\utils\string_util.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\editlib\SyntaxColors.cpp" />
-    <ClCompile Include="..\editlib\parsers\tcl.cpp" />
-    <ClCompile Include="..\editlib\parsers\tex.cpp" />
-    <ClCompile Include="..\editlib\UndoRecord.cpp" />
-    <ClCompile Include="..\editlib\parsers\verilog.cpp" />
-    <ClCompile Include="..\editlib\parsers\vhdl.cpp" />
-    <ClCompile Include="..\editlib\ViewableWhitespace.cpp" />
-    <ClCompile Include="..\editlib\utils\wcwidth.cpp" />
-    <ClCompile Include="..\editlib\parsers\xml.cpp" />
-=======
->>>>>>> master:Externals/crystaledit/Sample/SampleStatic.vcxproj
     <ClCompile Include="ChildFrm.cpp" />
     <ClCompile Include="MainFrm.cpp" />
     <ClCompile Include="pch.cpp">
@@ -709,45 +611,6 @@
     <ResourceCompile Include="Sample.rc" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD:Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
-    <ClInclude Include="..\editlib\ccrystaleditview.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderer.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrendererdirectwrite.h" />
-    <ClInclude Include="..\editlib\renderers\ccrystalrenderergdi.h" />
-    <ClInclude Include="..\editlib\ccrystaltextbuffer.h" />
-    <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />
-    <ClInclude Include="..\editlib\ccrystaltextview.h" />
-    <ClInclude Include="..\editlib\dialogs\ctextmarkerdlg.h" />
-    <ClInclude Include="..\editlib\dialogs\ceditreplacedlg.h" />
-    <ClInclude Include="..\editlib\dialogs\cfindtextdlg.h" />
-    <ClInclude Include="..\editlib\dialogs\chcondlg.h" />
-    <ClInclude Include="..\editlib\utils\cregexp.h" />
-    <ClInclude Include="..\editlib\crystaleditviewex.h" />
-    <ClInclude Include="..\editlib\crystalparser.h" />
-    <ClInclude Include="..\editlib\crystaltextblock.h" />
-    <ClInclude Include="..\editlib\utils\cs2cs.h" />
-    <ClInclude Include="..\editlib\editcmd.h" />
-    <ClInclude Include="..\editlib\editreg.h" />
-    <ClInclude Include="..\editlib\edtlib.h" />
-    <ClInclude Include="..\editlib\utils\DpiAware.h" />
-    <ClInclude Include="..\editlib\utils\filesup.h" />
-    <ClInclude Include="..\editlib\utils\fpattern.h" />
-    <ClInclude Include="..\editlib\dialogs\gotodlg.h" />
-    <ClInclude Include="..\editlib\utils\hqbitmap.h" />
-    <ClInclude Include="..\editlib\utils\icu.hpp" />
-    <ClInclude Include="..\editlib\LineInfo.h" />
-    <ClInclude Include="..\editlib\parsers\crystallineparser.h" />
-    <ClInclude Include="..\editlib\dialogs\memcombo.h" />
-    <ClInclude Include="..\editlib\utils\MDITileLayout.h" />
-    <ClInclude Include="..\editlib\utils\registry.h" />
-    <ClInclude Include="..\editlib\utils\string_util.h" />
-    <ClInclude Include="..\editlib\SyntaxColors.h" />
-    <ClInclude Include="..\editlib\UndoRecord.h" />
-    <ClInclude Include="..\editlib\ViewableWhitespace.h" />
-    <ClInclude Include="..\editlib\utils\wcwidth.h" />
-    <ClInclude Include="..\editlib\wispelld.h" />
-=======
->>>>>>> master:Externals/crystaledit/Sample/SampleStatic.vcxproj
     <ClInclude Include="ChildFrm.h" />
     <ClInclude Include="MainFrm.h" />
     <ClInclude Include="pch.h" />

diff --git a/Externals/crystaledit/Sample/resource.h b/Externals/crystaledit/Sample/resource.h
@@ -54,6 +54,9 @@
 #define ID_VIEW_SELECT_FONT             32801
 #define ID_VIEW_LINENUMBERS             32802
 #define ID_FILE_CONVERT_TO_HTML         32803
+#define ID_WINDOW_SPLIT_VERTICALLY      32804
+#define ID_WINDOW_SPLIT_HORIZONTALLY    32805
+#define ID_WINDOW_COMBINE               32806
 #define ID_EDIT_INDICATOR_COL           37900
 #define ID_READ_ONLY                    37901
 #define ID_INDICATOR_ENCODING           37905

diff --git a/Externals/crystaledit/editlib/editlib.vcxitems b/Externals/crystaledit/editlib/editlib.vcxitems
@@ -48,12 +48,14 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\cregexp_poco.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\cs2cs.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\DpiAware.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\filesup.cpp">
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\hqbitmap.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\icu.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\MDITileLayout.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\wcwidth.cpp">
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
@@ -92,9 +94,12 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\cregexp.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\cs2cs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\ctchar.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\DpiAware.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\filesup.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\hqbitmap.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\icu.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\MDITileLayout.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\mfc_templ_defines.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)utils\wcwidth.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ViewableWhitespace.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)wispelld.h" />

diff --git a/Externals/crystaledit/editlib/editlib.vcxitems.filters b/Externals/crystaledit/editlib/editlib.vcxitems.filters
@@ -100,6 +100,12 @@
       <Filter>Utils</Filter>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)FindTextHelper.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\DpiAware.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\MDITileLayout.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)ccrystaleditview.h">
@@ -202,5 +208,14 @@
       <Filter>Utils</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)FindTextHelper.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\DpiAware.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\MDITileLayout.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)utils\mfc_templ_defines.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>