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

Stop using native MSW wxImageList in wxUniv

Browse source 
This doesn't make any sense, native image list implementation is only
needed for interoperability with the native controls which are not used
by wxUniv, so always use the generic version in it instead.
This commit is contained in:
Vadim Zeitlin 2023-04-22 18:44:56 +02:00
parent 2d1c63a4c1
commit f5a735ed87
7 changed files with 211 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/bakefiles/files.bkl
View file

@ -1334,7 +1334,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="XWIN_LOWLEVEL_SRC" hints="files">
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1346,7 +1345,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/sound.h
@ -1360,7 +1358,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="GTK_WIN32_SRC" hints="files">
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/ole/automtn.cpp
src/msw/ole/comimpl.cpp
src/msw/ole/oleutils.cpp
@ -1378,7 +1375,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="GTK_WIN32_HDR" hints="files">
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/ole/automtn.h
wx/msw/ole/comimpl.h
wx/msw/ole/oleutils.h
@ -1540,6 +1536,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/bmpcbox.cpp
src/gtk/animate.cpp
src/gtk/srchctrl.cpp
src/generic/imaglist.cpp
</set>
<set var="GTK2_SRC" hints="files">
$(GTK_SRC)
@ -1608,6 +1605,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/dataview.h
wx/gtk/dvrenderer.h
wx/gtk/srchctrl.h
wx/generic/imaglist.h
</set>
<set var="GTK2_HDR" hints="files">
$(GTK_HDR)
@ -1721,7 +1719,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/gdiplus.cpp
src/msw/graphics.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/minifram.cpp
src/msw/nonownedwnd.cpp
src/msw/ole/comimpl.cpp
@ -1888,6 +1885,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/timectrl.cpp
src/msw/datecontrols.cpp
src/generic/activityindicator.cpp
src/msw/imaglist.cpp
</set>
<set var="MSW_HDR" hints="files">
wx/generic/clrpickerg.h
@ -2015,7 +2013,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/caret.cpp
src/generic/colour.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
src/generic/textmeasure.cpp
src/dfb/app.cpp
@ -2045,7 +2042,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/caret.h
wx/generic/colour.h
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/mask.h
wx/dfb/app.h
wx/dfb/bitmap.h
@ -2461,6 +2457,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/univ/topluniv.cpp
src/univ/winuniv.cpp
src/generic/activityindicator.cpp
src/generic/imaglist.cpp
</set>
<set var="UNIV_HDR" hints="files">
wx/generic/accel.h
@ -2519,6 +2516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/univ/toplevel.h
wx/univ/window.h
wx/generic/activityindicator.h
wx/generic/imaglist.h
</set>
<!-- ====================================================================== -->

12
build/cmake/files.cmake
View file

@ -1227,7 +1227,6 @@ set(UNIX_SRC
set(XWIN_LOWLEVEL_SRC
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1240,7 +1239,6 @@ set(XWIN_LOWLEVEL_SRC
set(XWIN_LOWLEVEL_HDR
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/sound.h
@ -1249,7 +1247,6 @@ set(XWIN_LOWLEVEL_HDR
set(GTK_WIN32_SRC
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/ole/automtn.cpp
src/msw/ole/comimpl.cpp
src/msw/ole/oleutils.cpp
@ -1268,7 +1265,6 @@ set(GTK_WIN32_SRC
set(GTK_WIN32_HDR
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/ole/automtn.h
wx/msw/ole/comimpl.h
wx/msw/ole/oleutils.h
@ -1424,6 +1420,7 @@ set(GTK_SRC
src/gtk/bmpcbox.cpp
src/gtk/hyperlink.cpp
src/gtk/srchctrl.cpp
src/generic/imaglist.cpp
)
set(GTK2_SRC
@ -1494,6 +1491,7 @@ set(GTK_HDR
wx/gtk/activityindicator.h
wx/gtk/hyperlink.h
wx/gtk/srchctrl.h
wx/generic/imaglist.h
)
set(GTK2_HDR
@ -1598,7 +1596,6 @@ set(MSW_LOWLEVEL_SRC
src/msw/graphics.cpp
src/msw/graphicsd2d.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/minifram.cpp
src/msw/nonownedwnd.cpp
src/msw/ole/comimpl.cpp
@ -1777,6 +1774,7 @@ set(MSW_SRC
src/msw/datetimectrl.cpp
src/msw/hyperlink.cpp
src/generic/activityindicator.cpp
src/msw/imaglist.cpp
)
set(MSW_HDR
@ -1901,7 +1899,6 @@ set(DFB_LOWLEVEL_SRC
src/generic/caret.cpp
src/generic/colour.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
src/generic/textmeasure.cpp
src/dfb/app.cpp
@ -1931,7 +1928,6 @@ set(DFB_LOWLEVEL_HDR
wx/generic/caret.h
wx/generic/colour.h
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/mask.h
wx/dfb/app.h
wx/dfb/bitmap.h
@ -2327,6 +2323,7 @@ set(UNIV_SRC
src/univ/topluniv.cpp
src/univ/winuniv.cpp
src/generic/activityindicator.cpp
src/generic/imaglist.cpp
)
set(UNIV_HDR
@ -2386,6 +2383,7 @@ set(UNIV_HDR
wx/univ/toplevel.h
wx/univ/window.h
wx/generic/activityindicator.h
wx/generic/imaglist.h
)
set(MEDIA_CMN_SRC

12
build/files
View file

@ -1243,7 +1243,6 @@ UNIX_SRC =
XWIN_LOWLEVEL_SRC =
src/common/taskbarcmn.cpp
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1254,7 +1253,6 @@ XWIN_LOWLEVEL_SRC =
XWIN_LOWLEVEL_HDR =
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/joystick.h
wx/unix/sound.h
@ -1266,7 +1264,6 @@ XWIN_LOWLEVEL_HDR =
GTK_WIN32_SRC =
src/common/taskbarcmn.cpp
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/dialup.cpp
src/msw/dib.cpp
src/msw/display.cpp
@ -1282,7 +1279,6 @@ GTK_WIN32_SRC =
src/unix/fontutil.cpp
GTK_WIN32_HDR =
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/dib.h
wx/msw/joystick.h
wx/msw/ole/automtn.h
@ -1371,6 +1367,7 @@ GTK_SRC =
src/generic/fdrepdlg.cpp
# Needed as long as we support GTK+ < 2.6
src/generic/filepickerg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
@ -1441,6 +1438,7 @@ GTK_HDR =
wx/generic/activityindicator.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
wx/generic/imaglist.h
wx/generic/listctrl.h
wx/generic/statusbr.h
wx/gtk/accel.h
@ -1612,7 +1610,6 @@ MSW_LOWLEVEL_SRC =
src/msw/helpchm.cpp
src/msw/helpwin.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/joystick.cpp
src/msw/minifram.cpp
src/msw/nonownedwnd.cpp
@ -1738,6 +1735,7 @@ MSW_SRC =
src/msw/gauge.cpp
src/msw/headerctrl.cpp
src/msw/hyperlink.cpp
src/msw/imaglist.cpp
src/msw/iniconf.cpp
src/msw/listbox.cpp
src/msw/listctrl.cpp
@ -1891,7 +1889,6 @@ DFB_LOWLEVEL_SRC =
src/generic/caret.cpp
src/generic/colour.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
src/generic/textmeasure.cpp
src/dfb/app.cpp
@ -1919,7 +1916,6 @@ DFB_LOWLEVEL_HDR =
wx/generic/caret.h
wx/generic/colour.h
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/mask.h
wx/dfb/app.h
wx/dfb/bitmap.h
@ -2270,6 +2266,7 @@ UNIV_SRC =
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
src/generic/mdig.cpp
src/generic/prntdlgg.cpp
@ -2322,6 +2319,7 @@ UNIV_HDR =
wx/generic/filepickerg.h
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/imaglist.h
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/statusbr.h

60
build/msw/makefile.gcc
View file

@ -1896,7 +1896,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.o \
$(OBJS)\monodll_graphics.o \
$(OBJS)\monodll_icon.o \
$(OBJS)\monodll_imaglist.o \
$(OBJS)\monodll_minifram.o \
$(OBJS)\monodll_nonownedwnd.o \
$(OBJS)\monodll_comimpl.o \
@ -2007,6 +2006,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_timectrl.o \
$(OBJS)\monodll_datecontrols.o \
$(OBJS)\monodll_activityindicator.o \
$(OBJS)\monodll_msw_imaglist.o \
$(OBJS)\monodll_msw_checklst.o \
$(OBJS)\monodll_msw_fdrepdlg.o \
$(OBJS)\monodll_fontdlg.o \
@ -2244,7 +2244,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.o \
$(OBJS)\monodll_graphics.o \
$(OBJS)\monodll_icon.o \
$(OBJS)\monodll_imaglist.o \
$(OBJS)\monodll_minifram.o \
$(OBJS)\monodll_nonownedwnd.o \
$(OBJS)\monodll_comimpl.o \
@ -2341,6 +2340,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_topluniv.o \
$(OBJS)\monodll_winuniv.o \
$(OBJS)\monodll_activityindicator.o \
$(OBJS)\monodll_generic_imaglist.o \
$(OBJS)\monodll_gtk.o \
$(OBJS)\monodll_metal.o \
$(OBJS)\monodll_mono.o \
@ -2751,7 +2751,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiplus.o \
$(OBJS)\monolib_graphics.o \
$(OBJS)\monolib_icon.o \
$(OBJS)\monolib_imaglist.o \
$(OBJS)\monolib_minifram.o \
$(OBJS)\monolib_nonownedwnd.o \
$(OBJS)\monolib_comimpl.o \
@ -2862,6 +2861,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_timectrl.o \
$(OBJS)\monolib_datecontrols.o \
$(OBJS)\monolib_activityindicator.o \
$(OBJS)\monolib_msw_imaglist.o \
$(OBJS)\monolib_msw_checklst.o \
$(OBJS)\monolib_msw_fdrepdlg.o \
$(OBJS)\monolib_fontdlg.o \
@ -3099,7 +3099,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiplus.o \
$(OBJS)\monolib_graphics.o \
$(OBJS)\monolib_icon.o \
$(OBJS)\monolib_imaglist.o \
$(OBJS)\monolib_minifram.o \
$(OBJS)\monolib_nonownedwnd.o \
$(OBJS)\monolib_comimpl.o \
@ -3196,6 +3195,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_topluniv.o \
$(OBJS)\monolib_winuniv.o \
$(OBJS)\monolib_activityindicator.o \
$(OBJS)\monolib_generic_imaglist.o \
$(OBJS)\monolib_gtk.o \
$(OBJS)\monolib_metal.o \
$(OBJS)\monolib_mono.o \
@ -3485,7 +3485,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiplus.o \
$(OBJS)\coredll_graphics.o \
$(OBJS)\coredll_icon.o \
$(OBJS)\coredll_imaglist.o \
$(OBJS)\coredll_minifram.o \
$(OBJS)\coredll_nonownedwnd.o \
$(OBJS)\coredll_comimpl.o \
@ -3596,6 +3595,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_timectrl.o \
$(OBJS)\coredll_datecontrols.o \
$(OBJS)\coredll_activityindicator.o \
$(OBJS)\coredll_msw_imaglist.o \
$(OBJS)\coredll_msw_checklst.o \
$(OBJS)\coredll_msw_fdrepdlg.o \
$(OBJS)\coredll_fontdlg.o \
@ -3833,7 +3833,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiplus.o \
$(OBJS)\coredll_graphics.o \
$(OBJS)\coredll_icon.o \
$(OBJS)\coredll_imaglist.o \
$(OBJS)\coredll_minifram.o \
$(OBJS)\coredll_nonownedwnd.o \
$(OBJS)\coredll_comimpl.o \
@ -3930,6 +3929,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_topluniv.o \
$(OBJS)\coredll_winuniv.o \
$(OBJS)\coredll_activityindicator.o \
$(OBJS)\coredll_generic_imaglist.o \
$(OBJS)\coredll_gtk.o \
$(OBJS)\coredll_metal.o \
$(OBJS)\coredll_mono.o \
@ -4176,7 +4176,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiplus.o \
$(OBJS)\corelib_graphics.o \
$(OBJS)\corelib_icon.o \
$(OBJS)\corelib_imaglist.o \
$(OBJS)\corelib_minifram.o \
$(OBJS)\corelib_nonownedwnd.o \
$(OBJS)\corelib_comimpl.o \
@ -4287,6 +4286,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_timectrl.o \
$(OBJS)\corelib_datecontrols.o \
$(OBJS)\corelib_activityindicator.o \
$(OBJS)\corelib_msw_imaglist.o \
$(OBJS)\corelib_msw_checklst.o \
$(OBJS)\corelib_msw_fdrepdlg.o \
$(OBJS)\corelib_fontdlg.o \
@ -4524,7 +4524,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiplus.o \
$(OBJS)\corelib_graphics.o \
$(OBJS)\corelib_icon.o \
$(OBJS)\corelib_imaglist.o \
$(OBJS)\corelib_minifram.o \
$(OBJS)\corelib_nonownedwnd.o \
$(OBJS)\corelib_comimpl.o \
@ -4621,6 +4620,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_topluniv.o \
$(OBJS)\corelib_winuniv.o \
$(OBJS)\corelib_activityindicator.o \
$(OBJS)\corelib_generic_imaglist.o \
$(OBJS)\corelib_gtk.o \
$(OBJS)\corelib_metal.o \
$(OBJS)\corelib_mono.o \
@ -7545,6 +7545,9 @@ $(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_msw_checklst.o: ../../src/msw/checklst.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -7689,6 +7692,9 @@ $(OBJS)\monodll_topluniv.o: ../../src/univ/topluniv.cpp
$(OBJS)\monodll_winuniv.o: ../../src/univ/winuniv.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_generic_imaglist.o: ../../src/generic/imaglist.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_gtk.o: ../../src/univ/themes/gtk.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -8288,11 +8294,6 @@ $(OBJS)\monodll_icon.o: ../../src/msw/icon.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -10138,6 +10139,9 @@ $(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_msw_checklst.o: ../../src/msw/checklst.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -10282,6 +10286,9 @@ $(OBJS)\monolib_topluniv.o: ../../src/univ/topluniv.cpp
$(OBJS)\monolib_winuniv.o: ../../src/univ/winuniv.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_generic_imaglist.o: ../../src/generic/imaglist.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_gtk.o: ../../src/univ/themes/gtk.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -10881,11 +10888,6 @@ $(OBJS)\monolib_icon.o: ../../src/msw/icon.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -13154,6 +13156,9 @@ $(OBJS)\coredll_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\coredll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_msw_checklst.o: ../../src/msw/checklst.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@ -13298,6 +13303,9 @@ $(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp
$(OBJS)\coredll_winuniv.o: ../../src/univ/winuniv.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_generic_imaglist.o: ../../src/generic/imaglist.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_gtk.o: ../../src/univ/themes/gtk.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@ -13435,11 +13443,6 @@ $(OBJS)\coredll_icon.o: ../../src/msw/icon.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@ -14913,6 +14916,9 @@ $(OBJS)\corelib_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\corelib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_msw_checklst.o: ../../src/msw/checklst.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@ -15057,6 +15063,9 @@ $(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp
$(OBJS)\corelib_winuniv.o: ../../src/univ/winuniv.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_generic_imaglist.o: ../../src/generic/imaglist.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_gtk.o: ../../src/univ/themes/gtk.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@ -15194,11 +15203,6 @@ $(OBJS)\corelib_icon.o: ../../src/msw/icon.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

60
build/msw/makefile.vc
View file

@ -2229,7 +2229,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.obj \
$(OBJS)\monodll_graphics.obj \
$(OBJS)\monodll_icon.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_minifram.obj \
$(OBJS)\monodll_nonownedwnd.obj \
$(OBJS)\monodll_comimpl.obj \
@ -2340,6 +2339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_timectrl.obj \
$(OBJS)\monodll_datecontrols.obj \
$(OBJS)\monodll_activityindicator.obj \
$(OBJS)\monodll_msw_imaglist.obj \
$(OBJS)\monodll_msw_checklst.obj \
$(OBJS)\monodll_msw_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
@ -2575,7 +2575,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.obj \
$(OBJS)\monodll_graphics.obj \
$(OBJS)\monodll_icon.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_minifram.obj \
$(OBJS)\monodll_nonownedwnd.obj \
$(OBJS)\monodll_comimpl.obj \
@ -2672,6 +2671,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_topluniv.obj \
$(OBJS)\monodll_winuniv.obj \
$(OBJS)\monodll_activityindicator.obj \
$(OBJS)\monodll_generic_imaglist.obj \
$(OBJS)\monodll_gtk.obj \
$(OBJS)\monodll_metal.obj \
$(OBJS)\monodll_mono.obj \
@ -3084,7 +3084,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiplus.obj \
$(OBJS)\monolib_graphics.obj \
$(OBJS)\monolib_icon.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_minifram.obj \
$(OBJS)\monolib_nonownedwnd.obj \
$(OBJS)\monolib_comimpl.obj \
@ -3195,6 +3194,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_timectrl.obj \
$(OBJS)\monolib_datecontrols.obj \
$(OBJS)\monolib_activityindicator.obj \
$(OBJS)\monolib_msw_imaglist.obj \
$(OBJS)\monolib_msw_checklst.obj \
$(OBJS)\monolib_msw_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
@ -3430,7 +3430,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_gdiplus.obj \
$(OBJS)\monolib_graphics.obj \
$(OBJS)\monolib_icon.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_minifram.obj \
$(OBJS)\monolib_nonownedwnd.obj \
$(OBJS)\monolib_comimpl.obj \
@ -3527,6 +3526,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_topluniv.obj \
$(OBJS)\monolib_winuniv.obj \
$(OBJS)\monolib_activityindicator.obj \
$(OBJS)\monolib_generic_imaglist.obj \
$(OBJS)\monolib_gtk.obj \
$(OBJS)\monolib_metal.obj \
$(OBJS)\monolib_mono.obj \
@ -3868,7 +3868,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiplus.obj \
$(OBJS)\coredll_graphics.obj \
$(OBJS)\coredll_icon.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_minifram.obj \
$(OBJS)\coredll_nonownedwnd.obj \
$(OBJS)\coredll_comimpl.obj \
@ -3979,6 +3978,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_timectrl.obj \
$(OBJS)\coredll_datecontrols.obj \
$(OBJS)\coredll_activityindicator.obj \
$(OBJS)\coredll_msw_imaglist.obj \
$(OBJS)\coredll_msw_checklst.obj \
$(OBJS)\coredll_msw_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
@ -4214,7 +4214,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_gdiplus.obj \
$(OBJS)\coredll_graphics.obj \
$(OBJS)\coredll_icon.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_minifram.obj \
$(OBJS)\coredll_nonownedwnd.obj \
$(OBJS)\coredll_comimpl.obj \
@ -4311,6 +4310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_topluniv.obj \
$(OBJS)\coredll_winuniv.obj \
$(OBJS)\coredll_activityindicator.obj \
$(OBJS)\coredll_generic_imaglist.obj \
$(OBJS)\coredll_gtk.obj \
$(OBJS)\coredll_metal.obj \
$(OBJS)\coredll_mono.obj \
@ -4557,7 +4557,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiplus.obj \
$(OBJS)\corelib_graphics.obj \
$(OBJS)\corelib_icon.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_minifram.obj \
$(OBJS)\corelib_nonownedwnd.obj \
$(OBJS)\corelib_comimpl.obj \
@ -4668,6 +4667,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_timectrl.obj \
$(OBJS)\corelib_datecontrols.obj \
$(OBJS)\corelib_activityindicator.obj \
$(OBJS)\corelib_msw_imaglist.obj \
$(OBJS)\corelib_msw_checklst.obj \
$(OBJS)\corelib_msw_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
@ -4903,7 +4903,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_gdiplus.obj \
$(OBJS)\corelib_graphics.obj \
$(OBJS)\corelib_icon.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_minifram.obj \
$(OBJS)\corelib_nonownedwnd.obj \
$(OBJS)\corelib_comimpl.obj \
@ -5000,6 +4999,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_topluniv.obj \
$(OBJS)\corelib_winuniv.obj \
$(OBJS)\corelib_activityindicator.obj \
$(OBJS)\corelib_generic_imaglist.obj \
$(OBJS)\corelib_gtk.obj \
$(OBJS)\corelib_metal.obj \
$(OBJS)\corelib_mono.obj \
@ -8002,6 +8002,9 @@ $(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp
$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
$(OBJS)\monodll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
@ -8146,6 +8149,9 @@ $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
$(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
$(OBJS)\monodll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
@ -8745,11 +8751,6 @@ $(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
@ -10595,6 +10596,9 @@ $(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp
$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
$(OBJS)\monolib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
@ -10739,6 +10743,9 @@ $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
$(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
$(OBJS)\monolib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
@ -11338,11 +11345,6 @@ $(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
@ -13611,6 +13613,9 @@ $(OBJS)\coredll_timectrl.obj: ..\..\src\msw\timectrl.cpp
$(OBJS)\coredll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
$(OBJS)\coredll_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
@ -13755,6 +13760,9 @@ $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp
$(OBJS)\coredll_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\imaglist.cpp
$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
@ -13892,11 +13900,6 @@ $(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
@ -15370,6 +15373,9 @@ $(OBJS)\corelib_timectrl.obj: ..\..\src\msw\timectrl.cpp
$(OBJS)\corelib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
$(OBJS)\corelib_msw_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
@ -15514,6 +15520,9 @@ $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp
$(OBJS)\corelib_generic_imaglist.obj: ..\..\src\generic\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\imaglist.cpp
$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp
@ -15651,11 +15660,6 @@ $(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp