OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86cce96)
crystaledit/Sample: Fix buid error
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 25 Apr 2020 05:52:57 +0000 (14:52 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 25 Apr 2020 05:52:57 +0000 (14:52 +0900)
12 files changed:
Externals/crystaledit/Sample/Sample.rc patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters patch | blob | history
Externals/crystaledit/Sample/res/mg_icons.png [new file with mode: 0644] patch | blob
Externals/crystaledit/Sample/resource.h patch | blob | history
Externals/crystaledit/editlib/ccrystalrenderergdi.cpp patch | blob | history
Externals/crystaledit/editlib/ccrystalrenderergdi.h patch | blob | history
Externals/crystaledit/editlib/ccrystaltextview.cpp patch | blob | history
Externals/crystaledit/editlib/cs2cs.cpp patch | blob | history
Externals/crystaledit/editlib/icu.hpp patch | blob | history

diff --git a/Externals/crystaledit/Sample/Sample.rc b/Externals/crystaledit/Sample/Sample.rc
index 08f8772..622885f 100755 (executable)
--- a/Externals/crystaledit/Sample/Sample.rc
+++ b/Externals/crystaledit/Sample/Sample.rc
@@ -402,6 +402,7 @@ END
 IDR_MAINFRAME           BITMAP                  "res\\Toolbar.bmp"\r
 \r
 IDR_MARGIN_ICONS        BITMAP                  "res\\mg_icons.bmp"\r
+IDR_MARGIN_ICONS_PNG    IMAGE                   "res\\mg_icons.png"\r
 \r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -616,6 +617,7 @@ BEGIN
     IDS_EOL_CR              "CR"\r
     IDS_EOL_CRLF            "CRLF"\r
     IDS_EOL_NONE            "None"\r
+    IDS_MARKER_COLOR_FMT    "Marker Color %d"\r
 END\r
 \r
 #endif    // English (United States) resources\r
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
index db0d823..b3b3c5f 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
@@ -38,7 +38,7 @@
     <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>\r
     <RootNamespace>SampleStatic</RootNamespace>\r
     <Keyword>MFCProj</Keyword>\r
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>\r
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">\r
@@ -49,7 +49,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
+    <PlatformToolset>v141</PlatformToolset>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
   </PropertyGroup>\r
@@ -61,7 +61,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
+    <PlatformToolset>v141</PlatformToolset>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
   </PropertyGroup>\r
@@ -73,7 +73,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
+    <PlatformToolset>v141</PlatformToolset>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
@@ -85,7 +85,7 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <PlatformToolset>v141_xp</PlatformToolset>\r
+    <PlatformToolset>v141</PlatformToolset>\r
     <UseOfMfc>Dynamic</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
@@ -471,7 +471,9 @@
     <ClCompile Include="..\editlib\basic.cpp" />\r
     <ClCompile Include="..\editlib\batch.cpp" />\r
     <ClCompile Include="..\editlib\ccrystaleditview.cpp" />\r
-    <ClCompile Include="..\editlib\ccrystalrendererdirectdraw.cpp" />\r
+    <ClCompile Include="..\editlib\ccrystalrendererdirectwrite.cpp">\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
     <ClCompile Include="..\editlib\ccrystalrenderergdi.cpp" />\r
     <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />\r
     <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />\r
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
index 803668f..90c90b8 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
@@ -237,12 +237,12 @@
     <ClCompile Include="..\editlib\icu.cpp">\r
       <Filter>editlib</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\editlib\ccrystalrendererdirectdraw.cpp">\r
-      <Filter>editlib</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\editlib\ccrystalrenderergdi.cpp">\r
       <Filter>editlib</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\editlib\ccrystalrendererdirectwrite.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="Sample.rc">\r
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
index 7a91d67..9565fb6 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
@@ -38,54 +38,53 @@
     <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>
     <RootNamespace>SampleStatic</RootNamespace>
     <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -471,7 +470,9 @@
     <ClCompile Include="..\editlib\basic.cpp" />
     <ClCompile Include="..\editlib\batch.cpp" />
     <ClCompile Include="..\editlib\ccrystaleditview.cpp" />
-    <ClCompile Include="..\editlib\ccrystalrendererdirectdraw.cpp" />
+    <ClCompile Include="..\editlib\ccrystalrendererdirectwrite.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\editlib\ccrystalrenderergdi.cpp" />
     <ClCompile Include="..\editlib\ccrystaltextbuffer.cpp" />
     <ClCompile Include="..\editlib\ccrystaltextmarkers.cpp" />
@@ -574,7 +575,7 @@
   <ItemGroup>
     <ClInclude Include="..\editlib\ccrystaleditview.h" />
     <ClInclude Include="..\editlib\ccrystalrenderer.h" />
-    <ClInclude Include="..\editlib\ccrystalrendererdirectdraw.h" />
+    <ClInclude Include="..\editlib\ccrystalrendererdirectwrite.h" />
     <ClInclude Include="..\editlib\ccrystalrenderergdi.h" />
     <ClInclude Include="..\editlib\ccrystaltextbuffer.h" />
     <ClInclude Include="..\editlib\ccrystaltextmarkers.h" />
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
index 05af213..e01b800 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
@@ -237,10 +237,10 @@
     <ClCompile Include="..\editlib\icu.cpp">
       <Filter>editlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\editlib\ccrystalrendererdirectdraw.cpp">
+    <ClCompile Include="..\editlib\ccrystalrenderergdi.cpp">
       <Filter>editlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\editlib\ccrystalrenderergdi.cpp">
+    <ClCompile Include="..\editlib\ccrystalrendererdirectwrite.cpp">
       <Filter>editlib</Filter>
     </ClCompile>
   </ItemGroup>
@@ -370,10 +370,10 @@
     <ClInclude Include="..\editlib\ccrystalrenderer.h">
       <Filter>editlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\editlib\ccrystalrendererdirectdraw.h">
+    <ClInclude Include="..\editlib\ccrystalrenderergdi.h">
       <Filter>editlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\editlib\ccrystalrenderergdi.h">
+    <ClInclude Include="..\editlib\ccrystalrendererdirectwrite.h">
       <Filter>editlib</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Externals/crystaledit/Sample/res/mg_icons.png b/Externals/crystaledit/Sample/res/mg_icons.png
new file mode 100644 (file)
index 0000000..50405ae
Binary files /dev/null and b/Externals/crystaledit/Sample/res/mg_icons.png differ
diff --git a/Externals/crystaledit/Sample/resource.h b/Externals/crystaledit/Sample/resource.h
index a15cd18..ae2d6f9 100755 (executable)
--- a/Externals/crystaledit/Sample/resource.h
+++ b/Externals/crystaledit/Sample/resource.h
@@ -8,6 +8,7 @@
 #define IDB_BITMAP1                     130\r
 #define IDR_MARGIN_ICONS                131\r
 #define IDR_MARGIN_CURSOR               132\r
+#define IDR_MARGIN_ICONS_PNG            133\r
 #define IDD_MESSAGE_BOX                 219\r
 #define IDD_EDIT_FIND                   220\r
 #define IDD_EDIT_REPLACE                221\r
@@ -62,6 +63,7 @@
 #define IDS_EOL_CR                      30406\r
 #define IDS_EOL_CRLF                    30407\r
 #define IDS_EOL_NONE                    30408\r
+#define IDS_MARKER_COLOR_FMT            30409\r
 #define ID_EDIT_DISABLEBSATSOL          32796\r
 #define ID_EDIT_DISABLEDRAGANDDROP      32797\r
 #define ID_EDIT_FIND_PREVIOUS           32799\r
diff --git a/Externals/crystaledit/editlib/ccrystalrenderergdi.cpp b/Externals/crystaledit/editlib/ccrystalrenderergdi.cpp
index 56bb3da..1b1ec97 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystalrenderergdi.cpp
+++ b/Externals/crystaledit/editlib/ccrystalrenderergdi.cpp
@@ -6,6 +6,7 @@
 
 #include "StdAfx.h"
 #include "ccrystalrenderergdi.h"
+#include "resource.h"
 
 CImageList* CCrystalRendererGDI::s_pIcons = nullptr;
 
diff --git a/Externals/crystaledit/editlib/ccrystalrenderergdi.h b/Externals/crystaledit/editlib/ccrystalrenderergdi.h
index f3ee5f1..fdd8c5c 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystalrenderergdi.h
+++ b/Externals/crystaledit/editlib/ccrystalrenderergdi.h
@@ -5,6 +5,7 @@
  */
 #include "ccrystalrenderer.h"
 #include <memory>
+#include <array>
 
 #pragma once
 
diff --git a/Externals/crystaledit/editlib/ccrystaltextview.cpp b/Externals/crystaledit/editlib/ccrystaltextview.cpp
index 297e2ee..081950c 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystaltextview.cpp
+++ b/Externals/crystaledit/editlib/ccrystaltextview.cpp
@@ -567,8 +567,10 @@ CCrystalTextView::CCrystalTextView ()
 , m_lfSavedBaseFont{}
 , m_pParser(nullptr)
 , m_pPrintFont(nullptr)
+#ifdef _UNICODE
 , m_bChWidthsCalculated{}
 , m_iChDoubleWidthFlags{}
+#endif
 , m_bPreparingToDrag(false)
 , m_bDraggingText(false)
 , m_bDragSelection(false)
diff --git a/Externals/crystaledit/editlib/cs2cs.cpp b/Externals/crystaledit/editlib/cs2cs.cpp
index afeacb0..a118022 100644 (file)
--- a/Externals/crystaledit/editlib/cs2cs.cpp
+++ b/Externals/crystaledit/editlib/cs2cs.cpp
@@ -110,8 +110,9 @@ skip_word (LPCTSTR s)
 ptrdiff_t
 get_coding (LPCTSTR name, type_codes *codes, int *coding)
 {
+  size_t pos;
   for (int i = 0; i < codes_count; i++)
-    if (size_t pos; (pos = str_pos (name, codes[i].name)) >= 0)
+    if ((pos = str_pos (name, codes[i].name)) >= 0)
       {
         *coding = i;
         return pos;
diff --git a/Externals/crystaledit/editlib/icu.hpp b/Externals/crystaledit/editlib/icu.hpp
index 7fe5202..ea4a591 100644 (file)
--- a/Externals/crystaledit/editlib/icu.hpp
+++ b/Externals/crystaledit/editlib/icu.hpp
@@ -1,6 +1,7 @@
 #pragma once\r
 \r
 #include <cstdint>\r
+#include <memory>\r
 #include "string_util.h"\r
 \r
 #ifndef ICU_EXTERN\r
About OSDN
Find Software
Develop Software
Help