Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade wxWidgets to 3.2.1 #249

Merged
merged 6 commits into from
Mar 14, 2023
Merged

Upgrade wxWidgets to 3.2.1 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dad526f
update wxWidgets to 3.2.1
eagleoflqj Nov 26, 2022
3d64f6f
fix build for vs2017
eagleoflqj Nov 29, 2022
c7cae5a
disable unused options
eagleoflqj Nov 30, 2022
8479628
Update wx to 3.2.2.1
vslavik Mar 13, 2023
0ff35b4
Revert spurious project files changes
vslavik Mar 13, 2023
81e5fe3
Remove dependency on WXWIN_COMPATIBILITY_3_0
vslavik Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions 3rdparty/wx.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- This file was generated by Bakefile (http://bakefile.org).
Do not modify, all changes will be overwritten! -->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
Expand Down Expand Up @@ -156,7 +156,6 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<StringPooling>true</StringPooling>
<DisableSpecificWarnings>4535</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -180,7 +179,6 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<StringPooling>true</StringPooling>
<DisableSpecificWarnings>4535</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -197,6 +195,7 @@
<ClCompile Include="wxWidgets\src\common\arrstr.cpp" />
<ClCompile Include="wxWidgets\src\common\artprov.cpp" />
<ClCompile Include="wxWidgets\src\common\bmpbase.cpp" />
<ClCompile Include="wxWidgets\src\common\bmpbndl.cpp" />
<ClCompile Include="wxWidgets\src\common\btncmn.cpp" />
<ClCompile Include="wxWidgets\src\common\checkboxcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\clntdata.cpp" />
Expand All @@ -214,11 +213,12 @@
<ClCompile Include="wxWidgets\src\common\dlgcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\dobjcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\dpycmn.cpp" />
<ClCompile Include="wxWidgets\src\common\dynarray.cpp" />
<ClCompile Include="wxWidgets\src\common\dynlib.cpp" />
<ClCompile Include="wxWidgets\src\common\encconv.cpp" />
<ClCompile Include="wxWidgets\src\common\event.cpp" />
<ClCompile Include="wxWidgets\src\common\evtloopcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\extended.c" />
<ClCompile Include="wxWidgets\src\common\ffile.cpp" />
<ClCompile Include="wxWidgets\src\common\file.cpp" />
<ClCompile Include="wxWidgets\src\common\filefn.cpp" />
<ClCompile Include="wxWidgets\src\common\filename.cpp" />
Expand All @@ -232,6 +232,7 @@
<ClCompile Include="wxWidgets\src\common\hash.cpp" />
<ClCompile Include="wxWidgets\src\common\hashmap.cpp" />
<ClCompile Include="wxWidgets\src\common\iconbndl.cpp" />
<ClCompile Include="wxWidgets\src\common\imagbmp.cpp" />
<ClCompile Include="wxWidgets\src\common\image.cpp" />
<ClCompile Include="wxWidgets\src\common\init.cpp" />
<ClCompile Include="wxWidgets\src\common\intl.cpp" />
Expand All @@ -253,6 +254,7 @@
<ClCompile Include="wxWidgets\src\common\platinfo.cpp" />
<ClCompile Include="wxWidgets\src\common\powercmn.cpp" />
<ClCompile Include="wxWidgets\src\common\process.cpp" />
<ClCompile Include="wxWidgets\src\common\quantize.cpp" />
<ClCompile Include="wxWidgets\src\common\rendcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\rgncmn.cpp" />
<ClCompile Include="wxWidgets\src\common\settcmn.cpp" />
Expand All @@ -262,13 +264,15 @@
<ClCompile Include="wxWidgets\src\common\stdpbase.cpp" />
<ClCompile Include="wxWidgets\src\common\stockitem.cpp" />
<ClCompile Include="wxWidgets\src\common\strconv.cpp" />
<ClCompile Include="wxWidgets\src\common\stream.cpp" />
<ClCompile Include="wxWidgets\src\common\string.cpp" />
<ClCompile Include="wxWidgets\src\common\stringimpl.cpp" />
<ClCompile Include="wxWidgets\src\common\stringops.cpp" />
<ClCompile Include="wxWidgets\src\common\strvararg.cpp" />
<ClCompile Include="wxWidgets\src\common\sysopt.cpp" />
<ClCompile Include="wxWidgets\src\common\textbuf.cpp" />
<ClCompile Include="wxWidgets\src\common\textcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\textentrycmn.cpp" />
<ClCompile Include="wxWidgets\src\common\textmeasurecmn.cpp" />
<ClCompile Include="wxWidgets\src\common\threadinfo.cpp" />
<ClCompile Include="wxWidgets\src\common\time.cpp" />
Expand All @@ -277,11 +281,16 @@
<ClCompile Include="wxWidgets\src\common\tokenzr.cpp" />
<ClCompile Include="wxWidgets\src\common\toplvcmn.cpp" />
<ClCompile Include="wxWidgets\src\common\translation.cpp" />
<ClCompile Include="wxWidgets\src\common\txtstrm.cpp" />
<ClCompile Include="wxWidgets\src\common\uilocale.cpp">
<ObjectFileName>$(IntDir)\uilocale_common.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\unichar.cpp" />
<ClCompile Include="wxWidgets\src\common\uri.cpp" />
<ClCompile Include="wxWidgets\src\common\ustring.cpp" />
<ClCompile Include="wxWidgets\src\common\utilscmn.cpp" />
<ClCompile Include="wxWidgets\src\common\variant.cpp" />
<ClCompile Include="wxWidgets\src\common\wfstream.cpp" />
<ClCompile Include="wxWidgets\src\common\wincmn.cpp" />
<ClCompile Include="wxWidgets\src\common\windowid.cpp" />
<ClCompile Include="wxWidgets\src\common\wrapsizer.cpp" />
Expand Down Expand Up @@ -331,6 +340,7 @@
<ClCompile Include="wxWidgets\src\msw\nativewin.cpp" />
<ClCompile Include="wxWidgets\src\msw\nonownedwnd.cpp" />
<ClCompile Include="wxWidgets\src\msw\ole\activex.cpp" />
<ClCompile Include="wxWidgets\src\msw\ole\comimpl.cpp" />
<ClCompile Include="wxWidgets\src\msw\ole\dataobj.cpp" />
<ClCompile Include="wxWidgets\src\msw\ole\oleutils.cpp" />
<ClCompile Include="wxWidgets\src\msw\ole\safearray.cpp" />
Expand All @@ -344,10 +354,15 @@
<ClCompile Include="wxWidgets\src\msw\statbmp.cpp" />
<ClCompile Include="wxWidgets\src\msw\stattext.cpp" />
<ClCompile Include="wxWidgets\src\msw\stdpaths.cpp" />
<ClCompile Include="wxWidgets\src\msw\textctrl.cpp" />
<ClCompile Include="wxWidgets\src\msw\textentry.cpp" />
<ClCompile Include="wxWidgets\src\msw\textmeasure.cpp" />
<ClCompile Include="wxWidgets\src\msw\thread.cpp" />
<ClCompile Include="wxWidgets\src\msw\timer.cpp" />
<ClCompile Include="wxWidgets\src\msw\toplevel.cpp" />
<ClCompile Include="wxWidgets\src\msw\uilocale.cpp">
<ObjectFileName>$(IntDir)\uilocale_msw.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\utils.cpp" />
<ClCompile Include="wxWidgets\src\msw\utilsexc.cpp" />
<ClCompile Include="wxWidgets\src\msw\utilsgui.cpp" />
Expand Down
45 changes: 42 additions & 3 deletions 3rdparty/wx.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<ClCompile Include="wxWidgets\src\common\bmpbase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\bmpbndl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\btncmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -91,9 +94,6 @@
<ClCompile Include="wxWidgets\src\common\dpycmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\dynarray.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\dynlib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -106,6 +106,12 @@
<ClCompile Include="wxWidgets\src\common\evtloopcmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\extended.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\ffile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -145,6 +151,9 @@
<ClCompile Include="wxWidgets\src\common\iconbndl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\imagbmp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -208,6 +217,9 @@
<ClCompile Include="wxWidgets\src\common\process.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\quantize.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\rendcmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -235,6 +247,9 @@
<ClCompile Include="wxWidgets\src\common\strconv.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\stream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -256,6 +271,9 @@
<ClCompile Include="wxWidgets\src\common\textcmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\textentrycmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\textmeasurecmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -280,6 +298,12 @@
<ClCompile Include="wxWidgets\src\common\translation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\txtstrm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\uilocale.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\unichar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -295,6 +319,9 @@
<ClCompile Include="wxWidgets\src\common\variant.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\wfstream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\common\wincmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -442,6 +469,9 @@
<ClCompile Include="wxWidgets\src\msw\ole\activex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\ole\comimpl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\ole\dataobj.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -481,6 +511,12 @@
<ClCompile Include="wxWidgets\src\msw\stdpaths.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\textctrl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\textentry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\textmeasure.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -493,6 +529,9 @@
<ClCompile Include="wxWidgets\src\msw\toplevel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\uilocale.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="wxWidgets\src\msw\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/wxWidgets
Open in desktop
Submodule wxWidgets updated 4807 files
14 changes: 13 additions & 1 deletion 3rdparty/wxWidgets.bkl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ library WinSparkle_wx : t_3rdparty {
src/common/arrstr.cpp
src/common/artprov.cpp
src/common/bmpbase.cpp
src/common/bmpbndl.cpp
src/common/btncmn.cpp
src/common/checkboxcmn.cpp
src/common/clntdata.cpp
Expand All @@ -38,12 +39,12 @@ library WinSparkle_wx : t_3rdparty {
src/common/dlgcmn.cpp
src/common/dobjcmn.cpp
src/common/dpycmn.cpp
src/common/dynarray.cpp
src/common/dynlib.cpp
src/common/encconv.cpp
src/common/event.cpp
src/common/evtloopcmn.cpp
src/common/extended.c
src/common/ffile.cpp
src/common/file.cpp
src/common/filefn.cpp
src/common/filename.cpp
Expand All @@ -57,6 +58,7 @@ library WinSparkle_wx : t_3rdparty {
src/common/hash.cpp
src/common/hashmap.cpp
src/common/iconbndl.cpp
src/common/imagbmp.cpp
src/common/image.cpp
src/common/init.cpp
src/common/intl.cpp
Expand All @@ -78,6 +80,7 @@ library WinSparkle_wx : t_3rdparty {
src/common/platinfo.cpp
src/common/powercmn.cpp
src/common/process.cpp
src/common/quantize.cpp
src/common/rendcmn.cpp
src/common/rgncmn.cpp
src/common/settcmn.cpp
Expand All @@ -87,13 +90,15 @@ library WinSparkle_wx : t_3rdparty {
src/common/stdpbase.cpp
src/common/stockitem.cpp
src/common/strconv.cpp
src/common/stream.cpp
src/common/string.cpp
src/common/stringimpl.cpp
src/common/stringops.cpp
src/common/strvararg.cpp
src/common/sysopt.cpp
src/common/textbuf.cpp
src/common/textcmn.cpp
src/common/textentrycmn.cpp
src/common/textmeasurecmn.cpp
src/common/threadinfo.cpp
src/common/time.cpp
Expand All @@ -102,11 +107,14 @@ library WinSparkle_wx : t_3rdparty {
src/common/tokenzr.cpp
src/common/toplvcmn.cpp
src/common/translation.cpp
src/common/txtstrm.cpp
src/common/uilocale.cpp
src/common/unichar.cpp
src/common/uri.cpp
src/common/ustring.cpp
src/common/utilscmn.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wincmn.cpp
src/common/windowid.cpp
src/common/wrapsizer.cpp
Expand Down Expand Up @@ -156,6 +164,7 @@ library WinSparkle_wx : t_3rdparty {
src/msw/nativewin.cpp
src/msw/nonownedwnd.cpp
src/msw/ole/activex.cpp
src/msw/ole/comimpl.cpp
src/msw/ole/dataobj.cpp
src/msw/ole/oleutils.cpp
src/msw/ole/safearray.cpp
Expand All @@ -169,10 +178,13 @@ library WinSparkle_wx : t_3rdparty {
src/msw/statbmp.cpp
src/msw/stattext.cpp
src/msw/stdpaths.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
src/msw/textmeasure.cpp
src/msw/thread.cpp
src/msw/timer.cpp
src/msw/toplevel.cpp
src/msw/uilocale.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
src/msw/utilsgui.cpp
Expand Down
Loading