Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-10-06 07:00:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for MSVS 2026
ABI check / ABI check (push) Has been cancelled
Unix builds / Ubuntu 24.04 wxGTK with ASAN (push) Has been cancelled
Unix builds / Ubuntu 22.04 wxGTK ANSI (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK UTF-8 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxMotif (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxQt (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxX11 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 2 (push) Has been cancelled
Unix builds / Ubuntu 20.04 wxGTK 3 with clang (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 3 static with gcc 4.8 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 3 STL (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxDFB (push) Has been cancelled
CMake builds / macOS 14 wxOSX (push) Has been cancelled
CMake builds / Windows MSVC (push) Has been cancelled
CMake builds / macOS 14 wxIOS (push) Has been cancelled
CMake builds / Ubuntu 22.04 wxGTK 3 (push) Has been cancelled
MSW builds / wxMSW vs2022 DLL Debug x64 (push) Has been cancelled
MSW builds / wxMSW vs2022 DLL Release x64 (push) Has been cancelled
MSW builds / wxMSW vs2022 Debug Win32 (push) Has been cancelled
MSW cross-builds / wxMSW 32 bits (push) Has been cancelled
MSW cross-builds / wxMSW 64 bits (push) Has been cancelled
Code Checks / Check Spelling (push) Has been cancelled
Code Checks / Check Whitespace (push) Has been cancelled
Code Checks / Check Mixed EOL (push) Has been cancelled
Code Checks / Check C++ Style (push) Has been cancelled
Update Documentation / Update Online Documentation (push) Has been cancelled

Browse Source 
Update wx_config.props, add MSVS 2026 solutions for the library
and the minimal sample, and update the docs.

See #26140.
This commit is contained in:
PB
2026-02-01 21:22:16 +01:00
committed by Vadim Zeitlin
parent 2ebaa0aee6
commit c5dddf5ee2
6 changed files with 104 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -35,7 +35,7 @@ This version of wxWidgets supports the following primary platforms:
Most popular C++ compilers are supported including but not limited to:
- Microsoft Visual C++ 2005 or later (up to 2022).
- Microsoft Visual C++ 2005 or later (up to 2026).
- g++ 4 or later (up to 14), including MinGW/MinGW-64/TDM under Windows.
- Clang (up to 19).
- Intel icc compiler.
build/msw/wx_config.props
+1
View File
@@ -11,6 +11,7 @@
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '18.0'">v145</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(VisualStudioVersion)' >= '15.0' and '$(WindowsTargetPlatformVersion)'==''">
<!-- Latest Target Version property -->
build/msw/wx_vc18.slnx
+81
View File
@@ -0,0 +1,81 @@
<Solution>
<Configurations>
<BuildType Name="Debug" />
<BuildType Name="DLL Debug" />
<BuildType Name="DLL Release" />
<BuildType Name="Release" />
<Platform Name="Win32" />
<Platform Name="x64" />
</Configurations>
<Project Path="wx_adv.vcxproj" Id="24c45343-fd20-5c92-81c1-35a2ae841e79">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_aui.vcxproj" Id="a16d3832-0f42-57ce-8f48-50e06649ade8">
<BuildDependency Project="wx_core.vcxproj" />
<BuildDependency Project="wx_html.vcxproj" />
</Project>
<Project Path="wx_base.vcxproj" Id="3fcc50c2-81e9-5db2-b8d8-2129427568b1">
<BuildDependency Project="wx_custom_build.vcxproj" />
<BuildDependency Project="wx_wxexpat.vcxproj" />
<BuildDependency Project="wx_wxregex.vcxproj" />
<BuildDependency Project="wx_wxzlib.vcxproj" />
</Project>
<Project Path="wx_core.vcxproj" Id="6744dad8-9c70-574a-bff2-9f8dddb24a75">
<BuildDependency Project="wx_base.vcxproj" />
<BuildDependency Project="wx_wxjpeg.vcxproj" />
<BuildDependency Project="wx_wxpng.vcxproj" />
<BuildDependency Project="wx_wxtiff.vcxproj" />
</Project>
<Project Path="wx_custom_build.vcxproj" Id="01f4ce10-2cfb-41a8-b41f-e54337868a1d" />
<Project Path="wx_gl.vcxproj" Id="da8b15ef-6750-5928-bc0e-c748213cf9b2">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_html.vcxproj" Id="33cc42f9-7756-5587-863c-8d4461b7c5dd">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_media.vcxproj" Id="8bd8f8d9-4275-5b42-a8f4-f1db2970a550">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_net.vcxproj" Id="69f2ede4-7d21-5738-9bc0-f66f61c9ae00">
<BuildDependency Project="wx_base.vcxproj" />
</Project>
<Project Path="wx_propgrid.vcxproj" Id="97fdab45-9c58-5bc5-a2f4-ee42739ebc63">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_qa.vcxproj" Id="e21129e0-7c08-5936-9d8c-0d60b5319ba7">
<BuildDependency Project="wx_core.vcxproj" />
<BuildDependency Project="wx_xml.vcxproj" />
</Project>
<Project Path="wx_ribbon.vcxproj" Id="87b42a9c-3f5c-53d7-9017-2b1cae39457d">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_richtext.vcxproj" Id="7fb0902d-8579-5dce-b883-daf66a885005">
<BuildDependency Project="wx_core.vcxproj" />
<BuildDependency Project="wx_html.vcxproj" />
<BuildDependency Project="wx_xml.vcxproj" />
</Project>
<Project Path="wx_stc.vcxproj" Id="23e1c437-a951-5943-8639-a17f3cf2e606">
<BuildDependency Project="wx_core.vcxproj" />
<BuildDependency Project="wx_wxscintilla.vcxproj" />
</Project>
<Project Path="wx_webview.vcxproj" Id="a8e8442a-078a-5fc5-b495-8d71ba77ee6e">
<BuildDependency Project="wx_core.vcxproj" />
</Project>
<Project Path="wx_wxexpat.vcxproj" Id="a1a8355b-0988-528e-9cc2-b971d6266669" />
<Project Path="wx_wxjpeg.vcxproj" Id="6053cc38-cdee-584c-8bc8-4b000d800fc7" />
<Project Path="wx_wxpng.vcxproj" Id="8acc122a-ca6a-5aa6-9c97-9cdd2e533db0" />
<Project Path="wx_wxregex.vcxproj" Id="56a4b526-bb81-5d01-aaa9-16d23bbb169d">
<BuildDependency Project="wx_custom_build.vcxproj" />
</Project>
<Project Path="wx_wxscintilla.vcxproj" Id="74827ebd-93dc-5110-ba95-3f2ab029b6b0" />
<Project Path="wx_wxtiff.vcxproj" Id="75596ce6-5ae7-55c9-b890-c07b0a657a83" />
<Project Path="wx_wxzlib.vcxproj" Id="8b867186-a0b5-5479-b824-e176edd27c40" />
<Project Path="wx_xml.vcxproj" Id="3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6">
<BuildDependency Project="wx_base.vcxproj" />
</Project>
<Project Path="wx_xrc.vcxproj" Id="09f2f96a-1cc6-5e43-af1d-956ec2a4888d">
<BuildDependency Project="wx_core.vcxproj" />
<BuildDependency Project="wx_html.vcxproj" />
<BuildDependency Project="wx_xml.vcxproj" />
</Project>
</Solution>
docs/changes.txt
+1
View File
@@ -261,6 +261,7 @@ All (GUI):
wxMSW:
- Add MSVS 2026 solution files (PB, #26140).
- Don't use first image for wxListCtrl items without images (#26062).
- Fix regression in wxStaticBitmap::SetBitmap() in 3.2.9 (#26106).
- Handle font names longer than 31 characters (moi15moi, #25333).
docs/msw/install.md
+4 -3
View File
@@ -50,10 +50,11 @@ Microsoft Visual C++ Compilation {#msw_build_msvs}
### From the IDE
Ready to use project files are provided for VC++ versions 8, 9,
10, 11, 12, 14, 15, 16 and 17 (also known as MSVS 2005, 2008, 2010, 2012,
2013, 2015, 2017, 2019 and 2022 respectively).
10, 11, 12, 14, 15, 16, 17 and 18 (also known as MSVS 2005, 2008, 2010, 2012,
2013, 2015, 2017, 2019, 2022 and 2026 respectively).
Simply open `wx_vcN.sln` (for N=8, 9, 10, 11, 12, 14, 15, 16 or 17) file,
Simply open `wx_vcN.sln` (for N=8, 9, 10, 11, 12, 14, 15, 16 or 17, matching
MSVS versions between 2005 and 2022) or `wx_vc18.slnx` (for MSVS 2026) file,
select the appropriate configuration (Debug or Release, static or DLL)
and build the solution. Notice that when building a DLL configuration,
you may need to perform the build several times because the projects
samples/minimal/minimal_vc18.slnx
+16
View File
@@ -0,0 +1,16 @@
<Solution>
<Configurations>
<BuildType Name="Debug" />
<BuildType Name="DLL Debug" />
<BuildType Name="DLL Release" />
<BuildType Name="Release" />
<Platform Name="Win32" />
<Platform Name="x64" />
</Configurations>
<Project Path="../../build/msw/wx_base.vcxproj" Id="3fcc50c2-81e9-5db2-b8d8-2129427568b1" />
<Project Path="../../build/msw/wx_core.vcxproj" Id="6744dad8-9c70-574a-bff2-9f8dddb24a75" />
<Project Path="minimal.vcxproj" Id="853d1fd7-20ab-586c-9699-9680f84ac985">
<BuildDependency Project="../../build/msw/wx_base.vcxproj" />
<BuildDependency Project="../../build/msw/wx_core.vcxproj" />
</Project>
</Solution>