Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into web-request

Browse Source 
Merge with the latest master in preparation for merging into master.

Rebake to resolve conflicts in generated files.
This commit is contained in:
Vadim Zeitlin
2020-12-12 17:44:45 +01:00
parent 68cbd54db0 86a3578a11
commit 6bdab7b3c8
3934 changed files with 147571 additions and 96246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/cmake/tests/CMakeLists.txt
View File

@@ -14,5 +14,6 @@ if(wxUSE_GUI AND wxBUILD_TESTS STREQUAL "ALL")
add_subdirectory(drawing)
add_subdirectory(gui)
add_subdirectory(headers)
endif()

4
build/cmake/tests/base/CMakeLists.txt
View File

@@ -122,9 +122,9 @@ wx_add_test(test_base ${TEST_SRC}
)
target_compile_definitions(test_base PRIVATE wxUSE_GUI=0 wxUSE_BASE=1)
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_base net)
wx_exe_link_libraries(test_base wxnet)
endif()
if(wxUSE_XML)
wx_exe_link_libraries(test_base xml)
wx_exe_link_libraries(test_base wxxml)
endif()
wx_test_enable_precomp(test_base)

6
build/cmake/tests/drawing/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
#############################################################################
# Name: build/cmake/tests/base/CMakeLists.txt
# Name: build/cmake/tests/drawing/CMakeLists.txt
# Purpose: CMake file for drawing test
# Author: Tobias Taschner
# Created: 2016-10-31
@@ -41,9 +41,9 @@ wx_add_test(test_drawing ${TEST_DRAWING_SRC}
DATA ${TEST_DRAWING_DATA}
)
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_drawing net)
wx_exe_link_libraries(test_drawing wxnet)
endif()
wx_exe_link_libraries(test_drawing core)
wx_exe_link_libraries(test_drawing wxcore)
wx_test_enable_precomp(test_drawing)
# This is a sample plugin, it simply uses a wxImage based

38
build/cmake/tests/gui/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
#############################################################################
# Name: build/cmake/tests/base/CMakeLists.txt
# Name: build/cmake/tests/gui/CMakeLists.txt
# Purpose: CMake file for gui test
# Author: Tobias Taschner
# Created: 2016-10-31
@@ -22,9 +22,11 @@ set(TEST_GUI_SRC
graphics/affinematrix.cpp
graphics/boundingbox.cpp
graphics/clippingbox.cpp
graphics/coords.cpp
graphics/graphmatrix.cpp
graphics/graphpath.cpp
config/config.cpp
controls/auitest.cpp
controls/bitmapcomboboxtest.cpp
controls/bitmaptogglebuttontest.cpp
controls/bookctrlbasetest.cpp
@@ -63,6 +65,7 @@ set(TEST_GUI_SRC
controls/slidertest.cpp
controls/spinctrldbltest.cpp
controls/spinctrltest.cpp
controls/styledtextctrltest.cpp
controls/textctrltest.cpp
controls/textentrytest.cpp
controls/togglebuttontest.cpp
@@ -101,11 +104,13 @@ set(TEST_GUI_SRC
net/socket.cpp
persistence/tlw.cpp
persistence/dataview.cpp
rowheightcache/rowheightcachetest.cpp
sizers/boxsizer.cpp
sizers/gridsizer.cpp
sizers/wrapsizer.cpp
toplevel/toplevel.cpp
validators/valnum.cpp
validators/valtext.cpp
window/clientsize.cpp
window/setsize.cpp
xml/xrctest.cpp
@@ -159,6 +164,15 @@ set(TEST_GUI_DATA
image/horse_box_average_100x100.png
image/horse_box_average_150x150.png
image/horse_box_average_300x300.png
image/paste_input_background.png
image/paste_input_black.png
image/paste_input_overlay_transparent_border_opaque_square.png
image/paste_input_overlay_transparent_border_semitransparent_circle.png
image/paste_input_overlay_transparent_border_semitransparent_square.png
image/paste_result_background_plus_circle_plus_square.png
image/paste_result_background_plus_overlay_transparent_border_opaque_square.png
image/paste_result_background_plus_overlay_transparent_border_semitransparent_square.png
image/paste_result_no_background_square_over_circle.png
intl/ja/internat.mo
intl/ja/internat.po
)
@@ -167,26 +181,32 @@ wx_add_test(test_gui ${TEST_GUI_SRC}
DATA ${TEST_GUI_DATA}
RES ../samples/sample.rc
)
wx_exe_link_libraries(test_gui core)
wx_exe_link_libraries(test_gui wxcore)
if(wxUSE_AUI)
wx_exe_link_libraries(test_gui wxaui)
endif()
if(wxUSE_RICHTEXT)
wx_exe_link_libraries(test_gui richtext)
wx_exe_link_libraries(test_gui wxrichtext)
endif()
if(wxUSE_STC)
wx_exe_link_libraries(test_gui wxstc)
endif()
if(wxUSE_MEDIACTRL)
wx_exe_link_libraries(test_gui media)
wx_exe_link_libraries(test_gui wxmedia)
endif()
if(wxUSE_XRC)
wx_exe_link_libraries(test_gui xrc)
wx_exe_link_libraries(test_gui wxxrc)
endif()
if(wxUSE_XML)
wx_exe_link_libraries(test_gui xml)
wx_exe_link_libraries(test_gui wxxml)
endif()
if(wxUSE_HTML)
wx_exe_link_libraries(test_gui html)
wx_exe_link_libraries(test_gui wxhtml)
endif()
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_gui net)
wx_exe_link_libraries(test_gui wxnet)
endif()
if(wxUSE_WEBVIEW)
wx_exe_link_libraries(test_gui webview)
wx_exe_link_libraries(test_gui wxwebview)
endif()
wx_test_enable_precomp(test_gui)

25
build/cmake/tests/headers/CMakeLists.txt Normal file
View File

@@ -0,0 +1,25 @@
#############################################################################
# Name: build/cmake/tests/headers/CMakeLists.txt
# Purpose: CMake file for headers test
# Author: Maarten Bent
# Created: 2020-07-23
# Copyright: (c) 2020 wxWidgets development team
# Licence: wxWindows licence
#############################################################################
set(TEST_SRC
test.cpp
testableframe.cpp
allheaders.cpp
testprec.h
testableframe.h
allheaders.h
)
wx_add_test(test_headers ${TEST_SRC})
wx_exe_link_libraries(test_headers wxcore)
if(wxUSE_SOCKETS)
wx_exe_link_libraries(test_headers wxnet)
endif()
wx_test_enable_precomp(test_headers)