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

Move generic files to common sources/headers in the right place

Browse Source 
This corresponds to the changes already manually done in
build/bakefiles/files.bkl but is now done in the right file and so also
for CMake-based build system.
This commit is contained in:
Vadim Zeitlin
2020-03-25 13:57:39 +01:00
parent c7084c8868
commit 842e185f3b
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/cmake/files.cmake
View File

@@ -269,7 +269,6 @@ set(QT_HDR
wx/qt/window.h wx/qt/window.h
wx/qt/dvrenderer.h wx/qt/dvrenderer.h
wx/qt/dvrenderers.h wx/qt/dvrenderers.h
wx/generic/animate.h
wx/qt/calctrl.h wx/qt/calctrl.h
wx/qt/taskbar.h wx/qt/taskbar.h
wx/qt/dataview.h wx/qt/dataview.h
@@ -369,7 +368,6 @@ set(QT_SRC
src/qt/dvrenderer.cpp src/qt/dvrenderer.cpp
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/common/taskbarcmn.cpp src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/qt/calctrl.cpp src/qt/calctrl.cpp
src/qt/dataview.cpp src/qt/dataview.cpp
src/qt/taskbar.cpp src/qt/taskbar.cpp
@@ -911,6 +909,7 @@ set(GUI_CMN_SRC
src/generic/editlbox.cpp src/generic/editlbox.cpp
src/generic/datavgen.cpp src/generic/datavgen.cpp
src/generic/rowheightcache.cpp src/generic/rowheightcache.cpp
src/generic/animateg.cpp
) )
set(GUI_CMN_HDR set(GUI_CMN_HDR
@@ -1199,6 +1198,7 @@ set(GUI_CMN_HDR
wx/generic/splash.h wx/generic/splash.h
wx/generic/calctrlg.h wx/generic/calctrlg.h
wx/generic/sashwin.h wx/generic/sashwin.h
wx/generic/animate.h
) )
set(UNIX_SRC set(UNIX_SRC
@@ -1596,7 +1596,6 @@ set(GTK1_SRC
src/gtk1/toolbar.cpp src/gtk1/toolbar.cpp
src/gtk1/textctrl.cpp src/gtk1/textctrl.cpp
src/gtk1/tglbtn.cpp src/gtk1/tglbtn.cpp
src/generic/animateg.cpp
src/gtk1/eggtrayicon.c src/gtk1/eggtrayicon.c
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/gtk1/taskbar.cpp src/gtk1/taskbar.cpp
@@ -1649,7 +1648,6 @@ set(GTK1_HDR
wx/gtk1/tglbtn.h wx/gtk1/tglbtn.h
wx/gtk1/treectrl.h wx/gtk1/treectrl.h
wx/generic/activityindicator.h wx/generic/activityindicator.h
wx/generic/animate.h
) )
set(MOTIF_LOWLEVEL_SRC set(MOTIF_LOWLEVEL_SRC
@@ -1742,7 +1740,6 @@ set(MOTIF_SRC
src/generic/statline.cpp src/generic/statline.cpp
src/generic/statusbr.cpp src/generic/statusbr.cpp
src/generic/tabg.cpp src/generic/tabg.cpp
src/generic/animateg.cpp
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
) )
@@ -1815,8 +1812,6 @@ set(MOTIF_HDR
wx/motif/toolbar.h wx/motif/toolbar.h
wx/motif/toplevel.h wx/motif/toplevel.h
wx/motif/window.h wx/motif/window.h
wx/generic/animateanimate.h
wx/generic/animate.h
) )
set(X11_LOWLEVEL_SRC set(X11_LOWLEVEL_SRC
@@ -2044,7 +2039,6 @@ set(MSW_SRC
src/msw/treectrl.cpp src/msw/treectrl.cpp
src/msw/bmpcbox.cpp src/msw/bmpcbox.cpp
src/msw/datectrl.cpp src/msw/datectrl.cpp
src/generic/animateg.cpp
src/msw/calctrl.cpp src/msw/calctrl.cpp
src/msw/datecontrols.cpp src/msw/datecontrols.cpp
src/msw/timectrl.cpp src/msw/timectrl.cpp
@@ -2158,7 +2152,6 @@ set(MSW_HDR
wx/msw/hyperlink.h wx/msw/hyperlink.h
wx/msw/datetimectrl.h wx/msw/datetimectrl.h
wx/msw/timectrl.h wx/msw/timectrl.h
wx/generic/animate.h
wx/generic/activityindicator.h wx/generic/activityindicator.h
) )
@@ -2240,7 +2233,6 @@ set(DFB_LOWLEVEL_SRC
src/dfb/utils.cpp src/dfb/utils.cpp
src/dfb/window.cpp src/dfb/window.cpp
src/dfb/wrapdfb.cpp src/dfb/wrapdfb.cpp
src/generic/animateg.cpp
) )
set(DFB_LOWLEVEL_HDR set(DFB_LOWLEVEL_HDR
@@ -2269,7 +2261,6 @@ set(DFB_LOWLEVEL_HDR
wx/dfb/toplevel.h wx/dfb/toplevel.h
wx/dfb/window.h wx/dfb/window.h
wx/dfb/wrapdfb.h wx/dfb/wrapdfb.h
wx/generic/animate.h
) )
set(OSX_LOWLEVEL_SRC set(OSX_LOWLEVEL_SRC
@@ -2524,7 +2515,6 @@ set(OSX_COCOA_SRC
src/osx/cocoa/dataview.mm src/osx/cocoa/dataview.mm
src/osx/carbon/sound.cpp src/osx/carbon/sound.cpp
src/osx/cocoa/taskbar.mm src/osx/cocoa/taskbar.mm
src/generic/animateg.cpp
src/common/taskbarcmn.cpp src/common/taskbarcmn.cpp
src/osx/dataview_osx.cpp src/osx/dataview_osx.cpp
src/osx/cocoa/notifmsg.mm src/osx/cocoa/notifmsg.mm
@@ -2551,7 +2541,6 @@ set(OSX_COCOA_HDR
wx/osx/datetimectrl.h wx/osx/datetimectrl.h
wx/osx/taskbarosx.h wx/osx/taskbarosx.h
wx/osx/dvrenderers.h wx/osx/dvrenderers.h
wx/generic/animate.h
wx/osx/core/joystick.h wx/osx/core/joystick.h
) )
@@ -2576,7 +2565,6 @@ set(OSX_IPHONE_SRC
src/osx/iphone/utils.mm src/osx/iphone/utils.mm
src/osx/iphone/window.mm src/osx/iphone/window.mm
src/osx/sound_osx.cpp src/osx/sound_osx.cpp
src/generic/animateg.cpp
src/osx/core/sound.cpp src/osx/core/sound.cpp
src/osx/iphone/statbmp.mm src/osx/iphone/statbmp.mm
) )
@@ -2586,7 +2574,6 @@ set(OSX_IPHONE_HDR
wx/osx/iphone/evtloop.h wx/osx/iphone/evtloop.h
wx/osx/iphone/private.h wx/osx/iphone/private.h
wx/generic/region.h wx/generic/region.h
wx/generic/animate.h
wx/osx/sound.h wx/osx/sound.h
) )
@@ -2655,7 +2642,6 @@ set(UNIV_SRC
set(UNIV_HDR set(UNIV_HDR
${UNIV_PLATFORM_HDR} ${UNIV_PLATFORM_HDR}
wx/generic/accel.h wx/generic/accel.h
wx/generic/animate.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
wx/generic/ctrlsub.h wx/generic/ctrlsub.h

18
build/files
View File

@@ -213,7 +213,6 @@ QT_WIN32_HDR=
QT_HDR = QT_HDR =
$(QT_PLATFORM_HDR) $(QT_PLATFORM_HDR)
wx/generic/activityindicator.h wx/generic/activityindicator.h
wx/generic/animate.h
wx/generic/caret.h wx/generic/caret.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
@@ -303,7 +302,6 @@ QT_SRC=
$(QT_PLATFORM_SRC) $(QT_PLATFORM_SRC)
src/common/taskbarcmn.cpp src/common/taskbarcmn.cpp
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/generic/animateg.cpp
src/generic/caret.cpp src/generic/caret.cpp
src/generic/clrpickerg.cpp src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp src/generic/collpaneg.cpp
@@ -860,6 +858,7 @@ GUI_CMN_SRC =
src/common/wrapsizer.cpp src/common/wrapsizer.cpp
src/common/xpmdecod.cpp src/common/xpmdecod.cpp
src/generic/aboutdlgg.cpp src/generic/aboutdlgg.cpp
src/generic/animateg.cpp
src/generic/bannerwindow.cpp src/generic/bannerwindow.cpp
src/generic/bmpcboxg.cpp src/generic/bmpcboxg.cpp
src/generic/busyinfo.cpp src/generic/busyinfo.cpp
@@ -1017,6 +1016,7 @@ GUI_CMN_HDR =
wx/gdicmn.h wx/gdicmn.h
wx/gdiobj.h wx/gdiobj.h
wx/generic/aboutdlgg.h wx/generic/aboutdlgg.h
wx/generic/animate.h
wx/generic/accel.h wx/generic/accel.h
wx/generic/bmpcbox.h wx/generic/bmpcbox.h
wx/generic/busyinfo.h wx/generic/busyinfo.h
@@ -1554,7 +1554,6 @@ GTK1_SRC =
# Generic implementations used by wxGTK1: # Generic implementations used by wxGTK1:
src/generic/accel.cpp src/generic/accel.cpp
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/generic/animateg.cpp
src/generic/clrpickerg.cpp src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp src/generic/colrdlgg.cpp
@@ -1604,7 +1603,6 @@ GTK1_SRC =
GTK1_HDR = GTK1_HDR =
wx/generic/activityindicator.h wx/generic/activityindicator.h
wx/generic/animate.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
wx/generic/colrdlgg.h wx/generic/colrdlgg.h
@@ -1726,7 +1724,6 @@ MOTIF_SRC =
src/motif/xmcombo/xmcombo.c src/motif/xmcombo/xmcombo.c
# Generic files used by wxMotif: # Generic files used by wxMotif:
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/generic/animateg.cpp
src/generic/clrpickerg.cpp src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp src/generic/colrdlgg.cpp
@@ -1744,8 +1741,6 @@ MOTIF_SRC =
src/generic/tabg.cpp src/generic/tabg.cpp
MOTIF_HDR = MOTIF_HDR =
wx/generic/animateanimate.h
wx/generic/animate.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
wx/generic/colrdlgg.h wx/generic/colrdlgg.h
@@ -1971,7 +1966,6 @@ MSW_LOWLEVEL_HDR =
MSW_SRC = MSW_SRC =
src/generic/activityindicator.cpp src/generic/activityindicator.cpp
src/generic/animateg.cpp
src/generic/clrpickerg.cpp src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp src/generic/collpaneg.cpp
src/generic/filepickerg.cpp src/generic/filepickerg.cpp
@@ -2041,7 +2035,6 @@ MSW_SRC =
MSW_HDR = MSW_HDR =
wx/generic/activityindicator.h wx/generic/activityindicator.h
wx/generic/animate.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
wx/generic/filepickerg.h wx/generic/filepickerg.h
@@ -2196,7 +2189,6 @@ MSW_DESKTOP_HDR =
DFB_LOWLEVEL_SRC = DFB_LOWLEVEL_SRC =
src/common/fontmgrcmn.cpp src/common/fontmgrcmn.cpp
src/generic/animateg.cpp
src/generic/caret.cpp src/generic/caret.cpp
src/generic/colour.cpp src/generic/colour.cpp
src/generic/icon.cpp src/generic/icon.cpp
@@ -2225,7 +2217,6 @@ DFB_LOWLEVEL_SRC =
src/dfb/window.cpp src/dfb/window.cpp
src/dfb/wrapdfb.cpp src/dfb/wrapdfb.cpp
DFB_LOWLEVEL_HDR = DFB_LOWLEVEL_HDR =
wx/generic/animate.h
wx/generic/caret.h wx/generic/caret.h
wx/generic/colour.h wx/generic/colour.h
wx/generic/icon.h wx/generic/icon.h
@@ -2457,7 +2448,6 @@ OSX_SHARED_HDR =
OSX_COCOA_SRC = OSX_COCOA_SRC =
$(OSX_COMMON_SRC) $(OSX_COMMON_SRC)
src/common/taskbarcmn.cpp src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/carbon/sound.cpp src/osx/carbon/sound.cpp
src/osx/cocoa/aboutdlg.mm src/osx/cocoa/aboutdlg.mm
src/osx/cocoa/activityindicator.mm src/osx/cocoa/activityindicator.mm
@@ -2513,7 +2503,6 @@ OSX_COCOA_SRC =
src/osx/timectrl_osx.cpp src/osx/timectrl_osx.cpp
OSX_COCOA_HDR = OSX_COCOA_HDR =
wx/generic/animate.h
wx/generic/region.h wx/generic/region.h
wx/osx/activityindicator.h wx/osx/activityindicator.h
wx/osx/cocoa/chkconf.h wx/osx/cocoa/chkconf.h
@@ -2538,7 +2527,6 @@ OSX_COCOA_HDR =
OSX_IPHONE_SRC = OSX_IPHONE_SRC =
$(OSX_COMMON_SRC) $(OSX_COMMON_SRC)
src/generic/animateg.cpp
src/generic/regiong.cpp src/generic/regiong.cpp
src/osx/core/sound.cpp src/osx/core/sound.cpp
src/osx/iphone/anybutton.mm src/osx/iphone/anybutton.mm
@@ -2561,7 +2549,6 @@ OSX_IPHONE_SRC =
src/osx/sound_osx.cpp src/osx/sound_osx.cpp
OSX_IPHONE_HDR = OSX_IPHONE_HDR =
wx/generic/animate.h
wx/generic/region.h wx/generic/region.h
wx/osx/iphone/chkconf.h wx/osx/iphone/chkconf.h
wx/osx/iphone/evtloop.h wx/osx/iphone/evtloop.h
@@ -2633,7 +2620,6 @@ UNIV_HDR =
$(UNIV_PLATFORM_HDR) $(UNIV_PLATFORM_HDR)
wx/generic/accel.h wx/generic/accel.h
wx/generic/activityindicator.h wx/generic/activityindicator.h
wx/generic/animate.h
wx/generic/clrpickerg.h wx/generic/clrpickerg.h
wx/generic/collpaneg.h wx/generic/collpaneg.h
wx/generic/ctrlsub.h wx/generic/ctrlsub.h