Skip to content

Commit 697c41e

Browse files
chcgchcg
committed
- update to N++ 8.7 files with hidpi support
- todo: update about dialog with urlctrl for darkmode support
1 parent d2b1349 commit 697c41e

19 files changed

+1702
-471
lines changed

‎NppTaskList.vcxproj

+26-12
Original file line numberDiff line numberDiff line change
@@ -134,53 +134,59 @@
134134
<ClCompile>
135135
<WarningLevel>Level4</WarningLevel>
136136
<Optimization>Disabled</Optimization>
137-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138138
<TreatWarningAsError>false</TreatWarningAsError>
139139
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
140140
<SDLCheck>true</SDLCheck>
141141
<MultiProcessorCompilation>true</MultiProcessorCompilation>
142142
<MinimalRebuild>false</MinimalRebuild>
143+
<LanguageStandard>stdcpp17</LanguageStandard>
144+
<LanguageStandard_C>stdc17</LanguageStandard_C>
143145
</ClCompile>
144146
<Link>
145147
<SubSystem>Windows</SubSystem>
146148
<GenerateDebugInformation>true</GenerateDebugInformation>
147-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
149+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
148150
</Link>
149151
</ItemDefinitionGroup>
150152
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
151153
<ClCompile>
152154
<WarningLevel>Level4</WarningLevel>
153155
<Optimization>Disabled</Optimization>
154-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155157
<TreatWarningAsError>false</TreatWarningAsError>
156158
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
157159
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
158160
<SDLCheck>true</SDLCheck>
159161
<MultiProcessorCompilation>true</MultiProcessorCompilation>
160162
<MinimalRebuild>false</MinimalRebuild>
163+
<LanguageStandard>stdcpp17</LanguageStandard>
164+
<LanguageStandard_C>stdc17</LanguageStandard_C>
161165
</ClCompile>
162166
<Link>
163167
<SubSystem>Windows</SubSystem>
164168
<GenerateDebugInformation>true</GenerateDebugInformation>
165-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
169+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
166170
</Link>
167171
</ItemDefinitionGroup>
168172
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
169173
<ClCompile>
170174
<WarningLevel>Level4</WarningLevel>
171175
<Optimization>Disabled</Optimization>
172-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
176+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
173177
<TreatWarningAsError>false</TreatWarningAsError>
174178
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
175179
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
176180
<SDLCheck>true</SDLCheck>
177181
<MultiProcessorCompilation>true</MultiProcessorCompilation>
178182
<MinimalRebuild>false</MinimalRebuild>
183+
<LanguageStandard>stdcpp17</LanguageStandard>
184+
<LanguageStandard_C>stdc17</LanguageStandard_C>
179185
</ClCompile>
180186
<Link>
181187
<SubSystem>Windows</SubSystem>
182188
<GenerateDebugInformation>true</GenerateDebugInformation>
183-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
189+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
184190
</Link>
185191
</ItemDefinitionGroup>
186192
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -189,18 +195,20 @@
189195
<Optimization>MaxSpeed</Optimization>
190196
<FunctionLevelLinking>true</FunctionLevelLinking>
191197
<IntrinsicFunctions>true</IntrinsicFunctions>
192-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
198+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193199
<TreatWarningAsError>false</TreatWarningAsError>
194200
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
195201
<SDLCheck>true</SDLCheck>
196202
<MultiProcessorCompilation>true</MultiProcessorCompilation>
203+
<LanguageStandard>stdcpp17</LanguageStandard>
204+
<LanguageStandard_C>stdc17</LanguageStandard_C>
197205
</ClCompile>
198206
<Link>
199207
<SubSystem>Windows</SubSystem>
200208
<GenerateDebugInformation>false</GenerateDebugInformation>
201209
<EnableCOMDATFolding>true</EnableCOMDATFolding>
202210
<OptimizeReferences>true</OptimizeReferences>
203-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
211+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
204212
<ImportLibrary>$(TargetName).lib</ImportLibrary>
205213
</Link>
206214
</ItemDefinitionGroup>
@@ -210,18 +218,20 @@
210218
<Optimization>MaxSpeed</Optimization>
211219
<FunctionLevelLinking>true</FunctionLevelLinking>
212220
<IntrinsicFunctions>true</IntrinsicFunctions>
213-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
221+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
214222
<TreatWarningAsError>false</TreatWarningAsError>
215223
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
216224
<SDLCheck>true</SDLCheck>
217225
<MultiProcessorCompilation>true</MultiProcessorCompilation>
226+
<LanguageStandard>stdcpp17</LanguageStandard>
227+
<LanguageStandard_C>stdc17</LanguageStandard_C>
218228
</ClCompile>
219229
<Link>
220230
<SubSystem>Windows</SubSystem>
221231
<GenerateDebugInformation>false</GenerateDebugInformation>
222232
<EnableCOMDATFolding>true</EnableCOMDATFolding>
223233
<OptimizeReferences>true</OptimizeReferences>
224-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
234+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
225235
<ImportLibrary>$(TargetName).lib</ImportLibrary>
226236
</Link>
227237
</ItemDefinitionGroup>
@@ -231,18 +241,20 @@
231241
<Optimization>MaxSpeed</Optimization>
232242
<FunctionLevelLinking>true</FunctionLevelLinking>
233243
<IntrinsicFunctions>true</IntrinsicFunctions>
234-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
244+
<PreprocessorDefinitions>WIN32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
235245
<TreatWarningAsError>false</TreatWarningAsError>
236246
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
237247
<SDLCheck>true</SDLCheck>
238248
<MultiProcessorCompilation>true</MultiProcessorCompilation>
249+
<LanguageStandard>stdcpp17</LanguageStandard>
250+
<LanguageStandard_C>stdc17</LanguageStandard_C>
239251
</ClCompile>
240252
<Link>
241253
<SubSystem>Windows</SubSystem>
242254
<GenerateDebugInformation>false</GenerateDebugInformation>
243255
<EnableCOMDATFolding>true</EnableCOMDATFolding>
244256
<OptimizeReferences>true</OptimizeReferences>
245-
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
257+
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
246258
<ImportLibrary>$(TargetName).lib</ImportLibrary>
247259
</Link>
248260
</ItemDefinitionGroup>
@@ -251,6 +263,7 @@
251263
<ClInclude Include="include\Docking.h" />
252264
<ClInclude Include="include\DockingDlgInterface.h" />
253265
<ClInclude Include="include\dockingResource.h" />
266+
<ClInclude Include="include\dpiManagerV2.h" />
254267
<ClInclude Include="include\menuCmdID.h" />
255268
<ClInclude Include="include\Notepad_plus_msgs.h" />
256269
<ClInclude Include="include\NppDarkMode.h" />
@@ -270,6 +283,7 @@
270283
<ClCompile Include="src\AboutDialog\AboutDlg.cpp" />
271284
<ClCompile Include="src\Common.cpp" />
272285
<ClCompile Include="src\config.cpp" />
286+
<ClCompile Include="src\dpiManagerV2.cpp" />
273287
<ClCompile Include="src\NppDarkModeDummy.cpp" />
274288
<ClCompile Include="src\NppTaskListPlugin.cpp" />
275289
<ClCompile Include="src\PluginDefinition.cpp" />

0 commit comments

Comments
 (0)