solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into webview-chromium

Browse source
This commit is contained in:
Vadim Zeitlin 2023-11-30 18:30:26 +01:00
commit e90817930a
1650 changed files with 15891 additions and 13384 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build/bakefiles/files.bkl
View file

@ -337,7 +337,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -375,6 +374,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/dvrenderers.h
$(QT_PLATFORM_HDR)
wx/qt/treectrl.h
wx/generic/paletteg.h
wx/qt/datectrl.h
wx/qt/timectrl.h
</set>
<set var="QT_SRC" hints="files">
@ -440,7 +442,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/minifram.cpp
src/qt/msgdlg.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/nonownedwnd.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
@ -473,6 +474,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/window.cpp
$(QT_PLATFORM_SRC)
src/qt/treectrl.cpp
src/generic/paletteg.cpp
src/qt/datectrl.cpp
src/qt/timectrl.cpp
</set>
<set var="MEDIA_QT_SRC" hints="files">
@ -2153,7 +2157,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
<!-- cocoa bridge -->
@ -2334,6 +2337,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/cocoa/activityindicator.mm
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
src/osx/cocoa/renderer.mm
</set>
<set var="OSX_COCOA_HDR" hints="files">
wx/osx/cocoa/chkconf.h

1
build/bakefiles/wxpresets/libsample/libsample.cpp
View file

@ -2,7 +2,6 @@
// Name: libsample.cpp
// Purpose: The source of a dummy sample wx-based library
// Author: Francesco Montorsi
// Modified by:
// Created: 26/11/06
// Copyright: (c) Francesco Montorsi
// Licence: wxWindows licence

1
build/bakefiles/wxpresets/sample/minimal.cpp
View file

@ -2,7 +2,6 @@
// Name: minimal.cpp
// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence

2
build/cmake/README.md
View file

@ -25,7 +25,7 @@ Files
* functions.cmake
* contains various wxWidgets specific functions and macros used throughout
the CMake files
* Every function should contain a short description of it's parameters as
* Every function should contain a short description of its parameters as
a comment before the function/macro
* install.cmake
* Handles definitions for the `install` and `uninstall` target

10
build/cmake/files.cmake
View file

@ -255,7 +255,6 @@ set(QT_HDR
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -288,6 +287,9 @@ set(QT_HDR
wx/generic/activityindicator.h
${QT_PLATFORM_HDR}
wx/qt/treectrl.h
wx/generic/paletteg.h
wx/qt/datectrl.h
wx/qt/timectrl.h
)
set(QT_SRC
@ -346,7 +348,6 @@ set(QT_SRC
src/qt/msgdlg.cpp
src/qt/nonownedwnd.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
src/qt/printdlg.cpp
@ -386,6 +387,9 @@ set(QT_SRC
src/qt/taskbar.cpp
${QT_PLATFORM_SRC}
src/qt/treectrl.cpp
src/generic/paletteg.cpp
src/qt/datectrl.cpp
src/qt/timectrl.cpp
)
set(MEDIA_QT_SRC
@ -2032,7 +2036,6 @@ set(OSX_COMMON_SRC
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
# cocoa bridge
@ -2208,6 +2211,7 @@ set(OSX_COCOA_SRC
src/osx/core/sound.cpp
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
src/osx/cocoa/renderer.mm
)
set(OSX_COCOA_HDR

32
build/cmake/source_groups.cmake
View file

@ -11,22 +11,22 @@
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
function(wx_set_source_groups)
source_group("Common Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/.*\\.h")
source_group("Common Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/common/.*")
source_group("GTK+ Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/gtk/.*")
source_group("MSW Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/msw/.*")
source_group("OSX Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/osx/.*")
source_group("Generic Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/generic/.*")
source_group("wxUniv Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/univ/.*")
source_group("wxHTML Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/html/.*")
source_group("Setup Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/.*/setup.h")
source_group("GTK+ Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/gtk/.*")
source_group("MSW Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/msw/.*")
source_group("OSX Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/osx/.*")
source_group("Generic Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/generic/.*")
source_group("wxUniv Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/univ/.*")
source_group("wxHTML Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/html/.*")
source_group("Common Headers" REGULAR_EXPRESSION "/include/wx/.*\\.h")
source_group("Common Sources" REGULAR_EXPRESSION "/src/common/.*")
source_group("GTK+ Sources" REGULAR_EXPRESSION "/src/gtk/.*")
source_group("MSW Sources" REGULAR_EXPRESSION "/src/msw/.*")
source_group("OSX Sources" REGULAR_EXPRESSION "/src/osx/.*")
source_group("Generic Sources" REGULAR_EXPRESSION "/src/generic/.*")
source_group("wxUniv Sources" REGULAR_EXPRESSION "/src/univ/.*")
source_group("wxHTML Sources" REGULAR_EXPRESSION "/src/html/.*")
source_group("Setup Headers" REGULAR_EXPRESSION "/include/.*/setup.h")
source_group("GTK+ Headers" REGULAR_EXPRESSION "/include/wx/gtk/.*")
source_group("MSW Headers" REGULAR_EXPRESSION "/include/wx/msw/.*")
source_group("OSX Headers" REGULAR_EXPRESSION "/include/wx/osx/.*")
source_group("Generic Headers" REGULAR_EXPRESSION "/include/wx/generic/.*")
source_group("wxUniv Headers" REGULAR_EXPRESSION "/include/wx/univ/.*")
source_group("wxHTML Headers" REGULAR_EXPRESSION "/include/wx/html/.*")
source_group("Setup Headers" FILES ${wxSETUP_HEADER_FILE})
source_group("Resource Files" REGULAR_EXPRESSION "${wxSOURCE_DIR}/[^.]*.(rc|ico|png|icns|manifest|plist)$")
source_group("Resource Files" REGULAR_EXPRESSION "/[^.]*.(rc|ico|png|icns|manifest|plist)$")
source_group("CMake" REGULAR_EXPRESSION "(CMakeLists\\.txt|cmake_pch.*|.*_CXX_prefix\\.hxx\\.rule)$")
endfunction()

10
build/files
View file

@ -233,6 +233,7 @@ QT_HDR =
wx/generic/fontpickerg.h
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/paletteg.h
wx/generic/prntdlgg.h
wx/qt/accel.h
wx/qt/anybutton.h
@ -257,6 +258,7 @@ QT_HDR =
wx/qt/dataobj.h
wx/qt/dataobj2.h
wx/qt/dataview.h
wx/qt/datectrl.h
wx/qt/dc.h
wx/qt/dcclient.h
wx/qt/dcmemory.h
@ -283,7 +285,6 @@ QT_HDR =
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -304,6 +305,7 @@ QT_HDR =
wx/qt/textctrl.h
wx/qt/textentry.h
wx/qt/tglbtn.h
wx/qt/timectrl.h
wx/qt/toolbar.h
wx/qt/tooltip.h
wx/qt/toplevel.h
@ -322,6 +324,7 @@ QT_SRC=
src/generic/fontpickerg.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/paletteg.cpp
src/generic/prntdlgg.cpp
src/generic/textmeasure.cpp
src/qt/accel.cpp
@ -347,6 +350,7 @@ QT_SRC=
src/qt/cursor.cpp
src/qt/dataobj.cpp
src/qt/dataview.cpp
src/qt/datectrl.cpp
src/qt/dc.cpp
src/qt/dcclient.cpp
src/qt/dcmemory.cpp
@ -375,7 +379,6 @@ QT_SRC=
src/qt/msgdlg.cpp
src/qt/nonownedwnd.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
src/qt/printdlg.cpp
@ -398,6 +401,7 @@ QT_SRC=
src/qt/textctrl.cpp
src/qt/textentry.cpp
src/qt/tglbtn.cpp
src/qt/timectrl.cpp
src/qt/timer.cpp
src/qt/toolbar.cpp
src/qt/tooltip.cpp
@ -2018,7 +2022,6 @@ OSX_COMMON_SRC =
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
# cocoa bridge
@ -2169,6 +2172,7 @@ OSX_COCOA_SRC =
src/osx/cocoa/preferences.mm
src/osx/cocoa/printdlg.mm
src/osx/cocoa/radiobut.mm
src/osx/cocoa/renderer.mm
src/osx/cocoa/scrolbar.mm
src/osx/cocoa/settings.mm
src/osx/cocoa/slider.mm

4
build/msw/wx_config.props
View file

@ -3,10 +3,6 @@
<PropertyGroup Label="Configuration">
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>

4
build/msw/wx_setup.props
View file

@ -31,9 +31,6 @@
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='ARM64'">
<wxArchSuffix>_arm64</wxArchSuffix>
</PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Itanium'">
<wxArchSuffix>_ia64</wxArchSuffix>
</PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug')">
<wxSuffixDebug>d</wxSuffixDebug>
</PropertyGroup>
@ -80,7 +77,6 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions Condition="'$(PlatformToolset)' == 'v140_xp'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(VisualStudioVersion)' >= '14.0'">/Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>

12400
build/osx/wxcocoa.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff

4654
build/osx/wxiphone.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff