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

70
build/cmake/files.cmake
View File

@@ -113,7 +113,6 @@ set(BASE_COREFOUNDATION_SRC
src/osx/core/evtloop_cf.cpp
src/osx/core/secretstore.cpp
src/osx/core/strconv_cf.cpp
src/osx/core/utilsexc_base.cpp
src/osx/cocoa/utils_base.mm
)
@@ -130,6 +129,9 @@ set(BASE_COREFOUNDATION_HDR
wx/osx/core/cfdictionary.h
wx/osx/core/cfarray.h
wx/osx/core/cftype.h
wx/osx/core/joystick.h
wx/osx/core/mimetype.h
wx/osx/core/dataview.h
)
set(BASE_OSX_SHARED_SRC
@@ -151,10 +153,6 @@ set(BASE_AND_GUI_OSX_COCOA_SRC
src/osx/cocoa/power.mm
)
set(BASE_AND_GUI_OSX_IPHONE_SRC
src/osx/iphone/utils.mm
)
set(BASE_OSX_NOTWXMAC_SRC
${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC}
${BASE_COREFOUNDATION_SRC}
@@ -175,6 +173,7 @@ set(QT_WIN32_SRC
src/msw/dialup.cpp
src/msw/dib.cpp
src/msw/joystick.cpp
src/qt/graphics.cpp
)
set(QT_WIN32_HDR
@@ -269,12 +268,12 @@ set(QT_HDR
wx/qt/window.h
wx/qt/dvrenderer.h
wx/qt/dvrenderers.h
wx/generic/animate.h
wx/qt/calctrl.h
wx/qt/taskbar.h
wx/qt/dataview.h
wx/generic/activityindicator.h
${QT_PLATFORM_HDR}
wx/qt/treectrl.h
)
set(QT_SRC
@@ -368,11 +367,11 @@ set(QT_SRC
src/qt/dvrenderer.cpp
src/generic/activityindicator.cpp
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/qt/calctrl.cpp
src/qt/dataview.cpp
src/qt/taskbar.cpp
${QT_PLATFORM_SRC}
src/qt/treectrl.cpp
)
set(MEDIA_QT_SRC
@@ -920,6 +919,8 @@ set(GUI_CMN_SRC
src/generic/editlbox.cpp
src/generic/datavgen.cpp
src/generic/creddlgg.cpp
src/generic/rowheightcache.cpp
src/generic/animateg.cpp
)
set(GUI_CMN_HDR
@@ -1210,6 +1211,7 @@ set(GUI_CMN_HDR
wx/generic/sashwin.h
wx/creddlg.h
wx/generic/creddlgg.h
wx/generic/animate.h
)
set(UNIX_SRC
@@ -1293,6 +1295,7 @@ set(GTK_LOWLEVEL_SRC
src/gtk/filectrl.cpp
src/gtk/filehistory.cpp
src/gtk/font.cpp
src/gtk/image_gtk.cpp
src/gtk/sockgtk.cpp
src/gtk/mimetype.cpp
src/gtk/minifram.cpp
@@ -1414,6 +1417,7 @@ set(GTK_SRC
src/gtk/animate.cpp
src/gtk/bmpcbox.cpp
src/gtk/hyperlink.cpp
src/gtk/srchctrl.cpp
)
set(GTK2_SRC
@@ -1485,6 +1489,7 @@ set(GTK_HDR
wx/gtk/taskbar.h
wx/gtk/activityindicator.h
wx/gtk/hyperlink.h
wx/gtk/srchctrl.h
)
set(GTK2_HDR
@@ -1605,7 +1610,6 @@ set(GTK1_SRC
src/gtk1/toolbar.cpp
src/gtk1/textctrl.cpp
src/gtk1/tglbtn.cpp
src/generic/animateg.cpp
src/gtk1/eggtrayicon.c
src/generic/activityindicator.cpp
src/gtk1/taskbar.cpp
@@ -1658,7 +1662,6 @@ set(GTK1_HDR
wx/gtk1/tglbtn.h
wx/gtk1/treectrl.h
wx/generic/activityindicator.h
wx/generic/animate.h
)
set(MOTIF_LOWLEVEL_SRC
@@ -1751,7 +1754,6 @@ set(MOTIF_SRC
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/animateg.cpp
src/generic/activityindicator.cpp
)
@@ -1824,8 +1826,6 @@ set(MOTIF_HDR
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
wx/generic/animateanimate.h
wx/generic/animate.h
)
set(X11_LOWLEVEL_SRC
@@ -1963,6 +1963,7 @@ set(MSW_LOWLEVEL_SRC
src/msw/taskbar.cpp
src/msw/richtooltip.cpp
src/msw/evtloop.cpp
src/msw/ole/access.cpp
)
set(MSW_LOWLEVEL_HDR
@@ -2029,7 +2030,6 @@ set(MSW_SRC
src/msw/nativdlg.cpp
src/msw/nativewin.cpp
src/msw/notebook.cpp
src/msw/ole/access.cpp
src/msw/ownerdrw.cpp
src/msw/progdlg.cpp
src/msw/radiobox.cpp
@@ -2053,7 +2053,6 @@ set(MSW_SRC
src/msw/treectrl.cpp
src/msw/bmpcbox.cpp
src/msw/datectrl.cpp
src/generic/animateg.cpp
src/msw/calctrl.cpp
src/msw/datecontrols.cpp
src/msw/timectrl.cpp
@@ -2167,7 +2166,6 @@ set(MSW_HDR
wx/msw/hyperlink.h
wx/msw/datetimectrl.h
wx/msw/timectrl.h
wx/generic/animate.h
wx/generic/activityindicator.h
)
@@ -2249,7 +2247,6 @@ set(DFB_LOWLEVEL_SRC
src/dfb/utils.cpp
src/dfb/window.cpp
src/dfb/wrapdfb.cpp
src/generic/animateg.cpp
)
set(DFB_LOWLEVEL_HDR
@@ -2278,7 +2275,6 @@ set(DFB_LOWLEVEL_HDR
wx/dfb/toplevel.h
wx/dfb/window.h
wx/dfb/wrapdfb.h
wx/generic/animate.h
)
set(OSX_LOWLEVEL_SRC
@@ -2429,7 +2425,6 @@ set(OSX_SHARED_HDR
wx/osx/frame.h
wx/osx/gauge.h
wx/osx/listbox.h
wx/osx/listctrl.h
wx/osx/mdi.h
wx/osx/menu.h
wx/osx/menuitem.h
@@ -2534,7 +2529,6 @@ set(OSX_COCOA_SRC
src/osx/cocoa/dataview.mm
src/osx/carbon/sound.cpp
src/osx/cocoa/taskbar.mm
src/generic/animateg.cpp
src/common/taskbarcmn.cpp
src/osx/dataview_osx.cpp
src/osx/cocoa/notifmsg.mm
@@ -2561,8 +2555,6 @@ set(OSX_COCOA_HDR
wx/osx/datetimectrl.h
wx/osx/taskbarosx.h
wx/osx/dvrenderers.h
wx/generic/animate.h
wx/osx/core/joystick.h
)
set(OSX_IPHONE_SRC
@@ -2586,17 +2578,16 @@ set(OSX_IPHONE_SRC
src/osx/iphone/utils.mm
src/osx/iphone/window.mm
src/osx/sound_osx.cpp
src/generic/animateg.cpp
src/osx/core/sound.cpp
src/osx/iphone/statbmp.mm
src/osx/iphone/menuitem.mm
src/osx/iphone/menu.mm
)
set(OSX_IPHONE_HDR
wx/osx/iphone/chkconf.h
wx/osx/iphone/evtloop.h
wx/osx/iphone/private.h
wx/generic/region.h
wx/generic/animate.h
wx/osx/sound.h
)
@@ -2608,7 +2599,6 @@ set(UNIV_THEMES_SRC
)
set(UNIV_SRC
${UNIV_PLATFORM_SRC}
src/generic/accel.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
@@ -2663,9 +2653,7 @@ set(UNIV_SRC
)
set(UNIV_HDR
${UNIV_PLATFORM_HDR}
wx/generic/accel.h
wx/generic/animate.h
wx/generic/clrpickerg.h
wx/generic/collpaneg.h
wx/generic/ctrlsub.h
@@ -2845,6 +2833,7 @@ set(HTML_CMN_HDR
set(WEBVIEW_MSW_SRC
src/msw/webview_ie.cpp
src/msw/webview_edge.cpp
)
set(WEBVIEW_CMN_SRC
@@ -2856,7 +2845,7 @@ set(WEBVIEW_CMN_SRC
set(WEBVIEW_MSW_HDR
wx/msw/webviewhistoryitem_ie.h
wx/msw/webview_ie.h
wx/msw/webview_missing.h
wx/msw/webview_edge.h
)
set(WEBVIEW_CMN_HDR
@@ -2922,6 +2911,7 @@ set(XRC_SRC
src/xrc/xh_grid.cpp
src/xrc/xh_html.cpp
src/xrc/xh_hyperlink.cpp
src/xrc/xh_infobar.cpp
src/xrc/xh_listb.cpp
src/xrc/xh_listbk.cpp
src/xrc/xh_listc.cpp
@@ -2957,8 +2947,8 @@ set(XRC_SRC
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
src/xrc/xh_dataview.cpp
)
set(XRC_HDR
@@ -2994,6 +2984,7 @@ set(XRC_HDR
wx/xrc/xh_grid.h
wx/xrc/xh_html.h
wx/xrc/xh_hyperlink.h
wx/xrc/xh_infobar.h
wx/xrc/xh_listb.h
wx/xrc/xh_listbk.h
wx/xrc/xh_listc.h
@@ -3028,6 +3019,7 @@ set(XRC_HDR
wx/xrc/xh_unkwn.h
wx/xrc/xh_wizrd.h
wx/xrc/xmlres.h
wx/xrc/xh_dataview.h
)
set(XML_SRC
@@ -3059,18 +3051,25 @@ set(OPENGL_MSW_HDR
set(OPENGL_GTK_SRC
src/gtk/glcanvas.cpp
src/unix/glx11.cpp
src/unix/glegl.cpp
)
set(OPENGL_GTK_HDR
wx/gtk/glcanvas.h
wx/unix/glx11.h
wx/unix/glegl.h
)
set(OPENGL_OSX_SHARED_SRC
set(OPENGL_OSX_COCOA_SRC
src/osx/cocoa/glcanvas.mm
src/osx/glcanvas_osx.cpp
)
set(OPENGL_OSX_IPHONE_SRC
src/osx/iphone/glcanvas.mm
src/osx/glcanvas_osx.cpp
)
set(UNIX_SOUND_SDL_SRC
src/unix/sound_sdl.cpp
)
@@ -3208,13 +3207,20 @@ set(RICHTEXT_HDR
wx/xrc/xh_richtext.h
)
set(STC_SRC
set(STC_CMN_SRC
src/stc/stc.cpp
src/stc/PlatWX.cpp
src/stc/ScintillaWX.cpp
)
set(STC_HDR
set(STC_CMN_HDR
wx/stc/stc.h
)
set(STC_OSX_COCOA_SRC
src/stc/PlatWXcocoa.mm
)
set(STC_OSX_COCOA_HDR
)