diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml
index 1ccb449416..ff5e6e4c9f 100644
--- a/.github/workflows/ci_msw_cross.yml
+++ b/.github/workflows/ci_msw_cross.yml
@@ -78,6 +78,9 @@ jobs:
configure_flags: --disable-compat32
- name: wxMSW 32 bits
triplet: i686-w64-mingw32
+ - name: wxMSW/Univ
+ configure_flags: --enable-universal --disable-compat32 --disable-debug --disable-optimise
+ minimal: true
env:
wxCONFIGURE_FLAGS: ${{ matrix.configure_flags }}
@@ -169,17 +172,26 @@ jobs:
run: |
make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
+ - name: Install and test
+ run: |
+ make install
+ make -C samples/minimal -f makefile.unx "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
+
+
- name: Build samples
+ if: matrix.minimal != true
run: |
make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS" samples
- name: Build tests
+ if: matrix.minimal != true
working-directory: tests
run: |
make $wxMAKE_ARGS failtest
make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
- name: Launch Xvfb
+ if: matrix.minimal != true
run: |
echo 'Launching Xvfb...'
mkdir /tmp/.X11-unix
@@ -209,6 +221,7 @@ jobs:
echo 'DISPLAY=:10' >> $GITHUB_ENV
- name: Run non-GUI tests
+ if: matrix.minimal != true
working-directory: tests
run: |
# Some tests are currently failing under Wine while they pass under
@@ -236,6 +249,7 @@ jobs:
$wxTEST_RUNNER ./test.exe "${excluded_tests[@]}"
- name: Run GUI tests
+ if: matrix.minimal != true
working-directory: tests
run: |
# Same as for the non-GUI test above, except many more GUI tests fail
diff --git a/Makefile.in b/Makefile.in
index e8b1581da1..4dbe88165b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2372,7 +2372,6 @@ COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR = \
@COND_PLATFORM_WIN32_1@QT_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR)
COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR = \
wx/generic/caret.h \
- wx/generic/imaglist.h \
wx/unix/fontutil.h \
wx/unix/utilsx11.h \
wx/unix/sound.h \
@@ -2380,7 +2379,6 @@ COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR = \
@COND_PLATFORM_MACOSX_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_MACOSX_1_GTK_PLATFORM_HDR)
COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR = \
wx/generic/caret.h \
- wx/generic/imaglist.h \
wx/unix/fontutil.h \
wx/unix/utilsx11.h \
wx/unix/sound.h \
@@ -2388,7 +2386,6 @@ COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR = \
@COND_PLATFORM_UNIX_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_GTK_PLATFORM_HDR)
COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \
wx/generic/caret.h \
- wx/generic/imaglist.h \
wx/msw/ole/automtn.h \
wx/msw/ole/comimpl.h \
wx/msw/ole/oleutils.h \
@@ -2753,7 +2750,6 @@ COND_TOOLKIT_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 \
@@ -2874,13 +2870,52 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \
wx/msw/helpchm.h \
wx/msw/sound.h \
wx/msw/joystick.h \
- wx/msw/evtloop.h
+ wx/msw/evtloop.h \
+ wx/msw/taskbarbutton.h \
+ wx/msw/gdiimage.h \
+ wx/msw/dib.h \
+ wx/msw/ole/droptgt.h \
+ wx/msw/icon.h \
+ wx/msw/toplevel.h \
+ wx/msw/darkmode.h \
+ wx/msw/dcprint.h \
+ wx/msw/tooltip.h \
+ wx/msw/ole/dataform.h \
+ wx/msw/region.h \
+ wx/msw/clipbrd.h \
+ wx/msw/app.h \
+ wx/msw/ole/oleutils.h \
+ wx/msw/dcscreen.h \
+ wx/msw/dcclient.h \
+ wx/msw/font.h \
+ wx/msw/ole/safearray.h \
+ wx/msw/colour.h \
+ wx/msw/ole/access.h \
+ wx/msw/ole/dataobj2.h \
+ wx/msw/dc.h \
+ wx/msw/brush.h \
+ wx/msw/ole/dataobj.h \
+ wx/msw/cursor.h \
+ wx/msw/ole/dropsrc.h \
+ wx/msw/printwin.h \
+ wx/msw/printdlg.h \
+ wx/msw/dcmemory.h \
+ wx/msw/appprogress.h \
+ wx/msw/caret.h \
+ wx/msw/window.h \
+ wx/msw/bitmap.h \
+ wx/msw/pen.h \
+ wx/msw/enhmeta.h \
+ wx/msw/ole/comimpl.h \
+ wx/msw/palette.h \
+ wx/msw/minifram.h \
+ wx/msw/ctrlsub.h \
+ wx/msw/init.h
@COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
@COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR =
@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR =
COND_TOOLKIT_X11_LOWLEVEL_HDR = \
wx/generic/caret.h \
- wx/generic/imaglist.h \
wx/unix/fontutil.h \
wx/unix/utilsx11.h \
wx/unix/sound.h \
@@ -2979,6 +3014,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \
wx/gtk/dataview.h \
wx/gtk/dvrenderer.h \
wx/gtk/srchctrl.h \
+ wx/generic/imaglist.h \
wx/generic/fontdlgg.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \
@@ -3042,7 +3078,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR = \
wx/gtk/bmpcbox.h \
wx/gtk/dataview.h \
wx/gtk/dvrenderer.h \
- wx/gtk/srchctrl.h
+ wx/gtk/srchctrl.h \
+ wx/generic/imaglist.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_GUI_HDR)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR = \
wx/generic/fdrepdlg.h \
@@ -3105,7 +3142,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR = \
wx/gtk/bmpcbox.h \
wx/gtk/dataview.h \
wx/gtk/dvrenderer.h \
- wx/gtk/srchctrl.h
+ wx/gtk/srchctrl.h \
+ wx/generic/imaglist.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR)
COND_TOOLKIT_MSW_GUI_HDR = \
wx/generic/clrpickerg.h \
@@ -3114,41 +3152,22 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/generic/fontpickerg.h \
wx/msw/accel.h \
wx/msw/anybutton.h \
- wx/msw/app.h \
- wx/msw/appprogress.h \
- wx/msw/bitmap.h \
wx/msw/bmpbuttn.h \
- wx/msw/brush.h \
wx/msw/button.h \
- wx/msw/caret.h \
wx/msw/checkbox.h \
wx/msw/choice.h \
- wx/msw/clipbrd.h \
wx/msw/colordlg.h \
- wx/msw/colour.h \
wx/msw/combo.h \
wx/msw/combobox.h \
wx/msw/control.h \
- wx/msw/ctrlsub.h \
- wx/msw/cursor.h \
wx/msw/custombgwin.h \
- wx/msw/dc.h \
- wx/msw/dcclient.h \
- wx/msw/dcmemory.h \
- wx/msw/dcprint.h \
- wx/msw/dcscreen.h \
wx/msw/dialog.h \
- wx/msw/dib.h \
wx/msw/dirdlg.h \
wx/msw/dragimag.h \
- wx/msw/enhmeta.h \
wx/msw/filedlg.h \
- wx/msw/font.h \
wx/msw/frame.h \
wx/msw/gauge.h \
- wx/msw/gdiimage.h \
wx/msw/headerctrl.h \
- wx/msw/icon.h \
wx/msw/imaglist.h \
wx/msw/iniconf.h \
wx/msw/init.h \
@@ -3158,30 +3177,15 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/msw/menu.h \
wx/msw/menuitem.h \
wx/msw/metafile.h \
- wx/msw/minifram.h \
wx/msw/missing.h \
wx/msw/msgdlg.h \
wx/msw/msvcrt.h \
wx/msw/notebook.h \
- wx/msw/ole/access.h \
- wx/msw/ole/comimpl.h \
- wx/msw/ole/dataform.h \
- wx/msw/ole/dataobj.h \
- wx/msw/ole/dataobj2.h \
- wx/msw/ole/dropsrc.h \
- wx/msw/ole/droptgt.h \
- wx/msw/ole/oleutils.h \
- wx/msw/ole/safearray.h \
wx/msw/ownerdrw.h \
wx/msw/ownerdrawnbutton.h \
- wx/msw/palette.h \
- wx/msw/pen.h \
- wx/msw/printdlg.h \
- wx/msw/printwin.h \
wx/msw/progdlg.h \
wx/msw/radiobox.h \
wx/msw/radiobut.h \
- wx/msw/region.h \
wx/msw/rcdefs.h \
wx/msw/richmsgdlg.h \
wx/msw/scrolbar.h \
@@ -3193,15 +3197,11 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/msw/statusbar.h \
wx/msw/statline.h \
wx/msw/stattext.h \
- wx/msw/taskbarbutton.h \
wx/msw/toolbar.h \
wx/msw/textctrl.h \
wx/msw/textentry.h \
wx/msw/tglbtn.h \
- wx/msw/tooltip.h \
- wx/msw/toplevel.h \
wx/msw/treectrl.h \
- wx/msw/window.h \
wx/msw/rt/utils.h \
wx/msw/hyperlink.h \
wx/msw/bmpcbox.h \
@@ -3211,7 +3211,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/msw/datectrl.h \
wx/msw/calctrl.h \
wx/generic/activityindicator.h \
- wx/msw/darkmode.h \
wx/msw/checklst.h \
wx/msw/fdrepdlg.h \
wx/msw/fontdlg.h \
@@ -3598,7 +3597,8 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \
wx/univ/toolbar.h \
wx/univ/toplevel.h \
wx/univ/window.h \
- wx/generic/activityindicator.h
+ wx/generic/activityindicator.h \
+ wx/generic/imaglist.h
@COND_USE_GUI_1_WXUNIV_1@GUI_CORE_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS)
COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/affinematrix2dbase.h \
@@ -4612,6 +4612,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
monodll_topluniv.o \
monodll_winuniv.o \
monodll_generic_activityindicator.o \
+ monodll_generic_imaglist.o \
monodll_gtk.o \
monodll_metal.o \
monodll_mono.o \
@@ -4826,7 +4827,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \
monodll_generic_caret.o \
monodll_generic_colour.o \
monodll_generic_icon.o \
- monodll_generic_imaglist.o \
monodll_mask.o \
monodll_generic_textmeasure.o \
monodll_dfb_app.o \
@@ -4997,7 +4997,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
monodll_gdiplus.o \
monodll_msw_graphics.o \
monodll_msw_icon.o \
- monodll_msw_imaglist.o \
monodll_msw_minifram.o \
monodll_msw_nonownedwnd.o \
monodll_comimpl.o \
@@ -5039,7 +5038,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
monodll_msw_evtloop.o \
monodll_access.o \
monodll_msw_bmpbndl.o \
- monodll_msw_overlay.o
+ monodll_msw_overlay.o \
+ monodll_darkmode.o \
+ monodll_msw_appprogress.o \
+ monodll_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -5047,7 +5049,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
@COND_TOOLKIT_OSX_IPHONE@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \
monodll_generic_caret.o \
- monodll_generic_imaglist.o \
monodll_unix_dialup.o \
monodll_unix_fontenum.o \
monodll_unix_fontutil.o \
@@ -5151,6 +5152,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \
monodll_gtk_bmpcbox.o \
monodll_animate.o \
monodll_gtk_srchctrl.o \
+ monodll_generic_imaglist.o \
monodll_generic_activityindicator.o \
monodll_eggtrayicon.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS)
@@ -5216,7 +5218,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS = \
monodll_gtk_dataview.o \
monodll_gtk_bmpcbox.o \
monodll_animate.o \
- monodll_gtk_srchctrl.o
+ monodll_gtk_srchctrl.o \
+ monodll_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS = \
monodll_generic_accel.o \
@@ -5280,7 +5283,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS = \
monodll_gtk_dataview.o \
monodll_gtk_bmpcbox.o \
monodll_animate.o \
- monodll_gtk_srchctrl.o
+ monodll_gtk_srchctrl.o \
+ monodll_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_clrpickerg.o \
@@ -5291,7 +5295,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_prntdlgg.o \
monodll_msw_accel.o \
monodll_msw_anybutton.o \
- monodll_msw_appprogress.o \
monodll_artmsw.o \
monodll_msw_bmpbuttn.o \
monodll_msw_button.o \
@@ -5333,7 +5336,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_msw_statusbar.o \
monodll_msw_statline.o \
monodll_msw_stattext.o \
- monodll_taskbarbutton.o \
monodll_msw_toolbar.o \
monodll_msw_textctrl.o \
monodll_msw_textentry.o \
@@ -5350,7 +5352,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_timectrl.o \
monodll_datecontrols.o \
monodll_generic_activityindicator.o \
- monodll_darkmode.o \
+ monodll_msw_imaglist.o \
monodll_msw_checklst.o \
monodll_msw_fdrepdlg.o \
monodll_msw_fontdlg.o
@@ -5554,7 +5556,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_generic_caret.o \
monodll_generic_colour.o \
monodll_generic_icon.o \
- monodll_generic_imaglist.o \
monodll_mask.o \
monodll_generic_textmeasure.o \
monodll_dfb_app.o \
@@ -5725,7 +5726,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_gdiplus.o \
monodll_msw_graphics.o \
monodll_msw_icon.o \
- monodll_msw_imaglist.o \
monodll_msw_minifram.o \
monodll_msw_nonownedwnd.o \
monodll_comimpl.o \
@@ -5767,7 +5767,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_msw_evtloop.o \
monodll_access.o \
monodll_msw_bmpbndl.o \
- monodll_msw_overlay.o
+ monodll_msw_overlay.o \
+ monodll_darkmode.o \
+ monodll_msw_appprogress.o \
+ monodll_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -5775,7 +5778,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_generic_caret.o \
- monodll_generic_imaglist.o \
monodll_unix_dialup.o \
monodll_unix_fontenum.o \
monodll_unix_fontutil.o \
@@ -6370,6 +6372,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
monolib_topluniv.o \
monolib_winuniv.o \
monolib_generic_activityindicator.o \
+ monolib_generic_imaglist.o \
monolib_gtk.o \
monolib_metal.o \
monolib_mono.o \
@@ -6584,7 +6587,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_generic_caret.o \
monolib_generic_colour.o \
monolib_generic_icon.o \
- monolib_generic_imaglist.o \
monolib_mask.o \
monolib_generic_textmeasure.o \
monolib_dfb_app.o \
@@ -6755,7 +6757,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_gdiplus.o \
monolib_msw_graphics.o \
monolib_msw_icon.o \
- monolib_msw_imaglist.o \
monolib_msw_minifram.o \
monolib_msw_nonownedwnd.o \
monolib_comimpl.o \
@@ -6797,7 +6798,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_msw_evtloop.o \
monolib_access.o \
monolib_msw_bmpbndl.o \
- monolib_msw_overlay.o
+ monolib_msw_overlay.o \
+ monolib_darkmode.o \
+ monolib_msw_appprogress.o \
+ monolib_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -6805,7 +6809,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_generic_caret.o \
- monolib_generic_imaglist.o \
monolib_unix_dialup.o \
monolib_unix_fontenum.o \
monolib_unix_fontutil.o \
@@ -6909,6 +6912,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \
monolib_gtk_bmpcbox.o \
monolib_animate.o \
monolib_gtk_srchctrl.o \
+ monolib_generic_imaglist.o \
monolib_generic_activityindicator.o \
monolib_eggtrayicon.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1)
@@ -6974,7 +6978,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1 = \
monolib_gtk_dataview.o \
monolib_gtk_bmpcbox.o \
monolib_animate.o \
- monolib_gtk_srchctrl.o
+ monolib_gtk_srchctrl.o \
+ monolib_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1 = \
monolib_generic_accel.o \
@@ -7038,7 +7043,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1 = \
monolib_gtk_dataview.o \
monolib_gtk_bmpcbox.o \
monolib_animate.o \
- monolib_gtk_srchctrl.o
+ monolib_gtk_srchctrl.o \
+ monolib_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_clrpickerg.o \
@@ -7049,7 +7055,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_prntdlgg.o \
monolib_msw_accel.o \
monolib_msw_anybutton.o \
- monolib_msw_appprogress.o \
monolib_artmsw.o \
monolib_msw_bmpbuttn.o \
monolib_msw_button.o \
@@ -7091,7 +7096,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_msw_statusbar.o \
monolib_msw_statline.o \
monolib_msw_stattext.o \
- monolib_taskbarbutton.o \
monolib_msw_toolbar.o \
monolib_msw_textctrl.o \
monolib_msw_textentry.o \
@@ -7108,7 +7112,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_timectrl.o \
monolib_datecontrols.o \
monolib_generic_activityindicator.o \
- monolib_darkmode.o \
+ monolib_msw_imaglist.o \
monolib_msw_checklst.o \
monolib_msw_fdrepdlg.o \
monolib_msw_fontdlg.o
@@ -7312,7 +7316,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_generic_caret.o \
monolib_generic_colour.o \
monolib_generic_icon.o \
- monolib_generic_imaglist.o \
monolib_mask.o \
monolib_generic_textmeasure.o \
monolib_dfb_app.o \
@@ -7483,7 +7486,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_gdiplus.o \
monolib_msw_graphics.o \
monolib_msw_icon.o \
- monolib_msw_imaglist.o \
monolib_msw_minifram.o \
monolib_msw_nonownedwnd.o \
monolib_comimpl.o \
@@ -7525,7 +7527,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_msw_evtloop.o \
monolib_access.o \
monolib_msw_bmpbndl.o \
- monolib_msw_overlay.o
+ monolib_msw_overlay.o \
+ monolib_darkmode.o \
+ monolib_msw_appprogress.o \
+ monolib_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -7533,7 +7538,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_generic_caret.o \
- monolib_generic_imaglist.o \
monolib_unix_dialup.o \
monolib_unix_fontenum.o \
monolib_unix_fontutil.o \
@@ -8280,6 +8284,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
coredll_topluniv.o \
coredll_winuniv.o \
coredll_generic_activityindicator.o \
+ coredll_generic_imaglist.o \
coredll_gtk.o \
coredll_metal.o \
coredll_mono.o \
@@ -8494,7 +8499,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_generic_caret.o \
coredll_generic_colour.o \
coredll_generic_icon.o \
- coredll_generic_imaglist.o \
coredll_mask.o \
coredll_generic_textmeasure.o \
coredll_dfb_app.o \
@@ -8665,7 +8669,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_gdiplus.o \
coredll_msw_graphics.o \
coredll_msw_icon.o \
- coredll_msw_imaglist.o \
coredll_msw_minifram.o \
coredll_msw_nonownedwnd.o \
coredll_comimpl.o \
@@ -8707,7 +8710,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_msw_evtloop.o \
coredll_access.o \
coredll_msw_bmpbndl.o \
- coredll_msw_overlay.o
+ coredll_msw_overlay.o \
+ coredll_darkmode.o \
+ coredll_msw_appprogress.o \
+ coredll_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -8715,7 +8721,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_generic_caret.o \
- coredll_generic_imaglist.o \
coredll_unix_dialup.o \
coredll_unix_fontenum.o \
coredll_unix_fontutil.o \
@@ -8819,6 +8824,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \
coredll_gtk_bmpcbox.o \
coredll_animate.o \
coredll_gtk_srchctrl.o \
+ coredll_generic_imaglist.o \
coredll_generic_activityindicator.o \
coredll_eggtrayicon.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2)
@@ -8884,7 +8890,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2 = \
coredll_gtk_dataview.o \
coredll_gtk_bmpcbox.o \
coredll_animate.o \
- coredll_gtk_srchctrl.o
+ coredll_gtk_srchctrl.o \
+ coredll_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2 = \
coredll_generic_accel.o \
@@ -8948,7 +8955,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2 = \
coredll_gtk_dataview.o \
coredll_gtk_bmpcbox.o \
coredll_animate.o \
- coredll_gtk_srchctrl.o
+ coredll_gtk_srchctrl.o \
+ coredll_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_clrpickerg.o \
@@ -8959,7 +8967,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_prntdlgg.o \
coredll_msw_accel.o \
coredll_msw_anybutton.o \
- coredll_msw_appprogress.o \
coredll_artmsw.o \
coredll_msw_bmpbuttn.o \
coredll_msw_button.o \
@@ -9001,7 +9008,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_msw_statusbar.o \
coredll_msw_statline.o \
coredll_msw_stattext.o \
- coredll_taskbarbutton.o \
coredll_msw_toolbar.o \
coredll_msw_textctrl.o \
coredll_msw_textentry.o \
@@ -9018,7 +9024,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_timectrl.o \
coredll_datecontrols.o \
coredll_generic_activityindicator.o \
- coredll_darkmode.o \
+ coredll_msw_imaglist.o \
coredll_msw_checklst.o \
coredll_msw_fdrepdlg.o \
coredll_msw_fontdlg.o
@@ -9222,7 +9228,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_generic_caret.o \
coredll_generic_colour.o \
coredll_generic_icon.o \
- coredll_generic_imaglist.o \
coredll_mask.o \
coredll_generic_textmeasure.o \
coredll_dfb_app.o \
@@ -9393,7 +9398,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_gdiplus.o \
coredll_msw_graphics.o \
coredll_msw_icon.o \
- coredll_msw_imaglist.o \
coredll_msw_minifram.o \
coredll_msw_nonownedwnd.o \
coredll_comimpl.o \
@@ -9435,7 +9439,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_msw_evtloop.o \
coredll_access.o \
coredll_msw_bmpbndl.o \
- coredll_msw_overlay.o
+ coredll_msw_overlay.o \
+ coredll_darkmode.o \
+ coredll_msw_appprogress.o \
+ coredll_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -9443,7 +9450,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_generic_caret.o \
- coredll_generic_imaglist.o \
coredll_unix_dialup.o \
coredll_unix_fontenum.o \
coredll_unix_fontutil.o \
@@ -9766,6 +9772,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
corelib_topluniv.o \
corelib_winuniv.o \
corelib_generic_activityindicator.o \
+ corelib_generic_imaglist.o \
corelib_gtk.o \
corelib_metal.o \
corelib_mono.o \
@@ -9980,7 +9987,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_generic_caret.o \
corelib_generic_colour.o \
corelib_generic_icon.o \
- corelib_generic_imaglist.o \
corelib_mask.o \
corelib_generic_textmeasure.o \
corelib_dfb_app.o \
@@ -10151,7 +10157,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_gdiplus.o \
corelib_msw_graphics.o \
corelib_msw_icon.o \
- corelib_msw_imaglist.o \
corelib_msw_minifram.o \
corelib_msw_nonownedwnd.o \
corelib_comimpl.o \
@@ -10193,7 +10198,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_msw_evtloop.o \
corelib_access.o \
corelib_msw_bmpbndl.o \
- corelib_msw_overlay.o
+ corelib_msw_overlay.o \
+ corelib_darkmode.o \
+ corelib_msw_appprogress.o \
+ corelib_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -10201,7 +10209,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_generic_caret.o \
- corelib_generic_imaglist.o \
corelib_unix_dialup.o \
corelib_unix_fontenum.o \
corelib_unix_fontutil.o \
@@ -10305,6 +10312,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \
corelib_gtk_bmpcbox.o \
corelib_animate.o \
corelib_gtk_srchctrl.o \
+ corelib_generic_imaglist.o \
corelib_generic_activityindicator.o \
corelib_eggtrayicon.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3)
@@ -10370,7 +10378,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3 = \
corelib_gtk_dataview.o \
corelib_gtk_bmpcbox.o \
corelib_animate.o \
- corelib_gtk_srchctrl.o
+ corelib_gtk_srchctrl.o \
+ corelib_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3 = \
corelib_generic_accel.o \
@@ -10434,7 +10443,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3 = \
corelib_gtk_dataview.o \
corelib_gtk_bmpcbox.o \
corelib_animate.o \
- corelib_gtk_srchctrl.o
+ corelib_gtk_srchctrl.o \
+ corelib_generic_imaglist.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_clrpickerg.o \
@@ -10445,7 +10455,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_prntdlgg.o \
corelib_msw_accel.o \
corelib_msw_anybutton.o \
- corelib_msw_appprogress.o \
corelib_artmsw.o \
corelib_msw_bmpbuttn.o \
corelib_msw_button.o \
@@ -10487,7 +10496,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_msw_statusbar.o \
corelib_msw_statline.o \
corelib_msw_stattext.o \
- corelib_taskbarbutton.o \
corelib_msw_toolbar.o \
corelib_msw_textctrl.o \
corelib_msw_textentry.o \
@@ -10504,7 +10512,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_timectrl.o \
corelib_datecontrols.o \
corelib_generic_activityindicator.o \
- corelib_darkmode.o \
+ corelib_msw_imaglist.o \
corelib_msw_checklst.o \
corelib_msw_fdrepdlg.o \
corelib_msw_fontdlg.o
@@ -10708,7 +10716,6 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_generic_caret.o \
corelib_generic_colour.o \
corelib_generic_icon.o \
- corelib_generic_imaglist.o \
corelib_mask.o \
corelib_generic_textmeasure.o \
corelib_dfb_app.o \
@@ -10879,7 +10886,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_gdiplus.o \
corelib_msw_graphics.o \
corelib_msw_icon.o \
- corelib_msw_imaglist.o \
corelib_msw_minifram.o \
corelib_msw_nonownedwnd.o \
corelib_comimpl.o \
@@ -10921,7 +10927,10 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_msw_evtloop.o \
corelib_access.o \
corelib_msw_bmpbndl.o \
- corelib_msw_overlay.o
+ corelib_msw_overlay.o \
+ corelib_darkmode.o \
+ corelib_msw_appprogress.o \
+ corelib_taskbarbutton.o
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -10929,7 +10938,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
@COND_TOOLKIT_OSX_IPHONE@ = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_generic_caret.o \
- corelib_generic_imaglist.o \
corelib_unix_dialup.o \
corelib_unix_fontenum.o \
corelib_unix_fontutil.o \
@@ -12262,7 +12270,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \
@COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS)
COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS = \
monodll_generic_caret.o \
- monodll_generic_imaglist.o \
monodll_unix_dialup.o \
monodll_unix_fontenum.o \
monodll_unix_fontutil.o \
@@ -12274,7 +12281,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS = \
@COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS)
COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS = \
monodll_generic_caret.o \
- monodll_generic_imaglist.o \
monodll_unix_dialup.o \
monodll_unix_fontenum.o \
monodll_unix_fontutil.o \
@@ -12286,7 +12292,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS = \
@COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS)
COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS = \
monodll_generic_caret.o \
- monodll_generic_imaglist.o \
monodll_automtn.o \
monodll_comimpl.o \
monodll_oleutils.o \
@@ -12399,7 +12404,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \
@COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0)
COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \
monolib_generic_caret.o \
- monolib_generic_imaglist.o \
monolib_unix_dialup.o \
monolib_unix_fontenum.o \
monolib_unix_fontutil.o \
@@ -12411,7 +12415,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \
@COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_27 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27)
COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \
monolib_generic_caret.o \
- monolib_generic_imaglist.o \
monolib_unix_dialup.o \
monolib_unix_fontenum.o \
monolib_unix_fontutil.o \
@@ -12423,7 +12426,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27 = \
@COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_27 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27)
COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_27 = \
monolib_generic_caret.o \
- monolib_generic_imaglist.o \
monolib_automtn.o \
monolib_comimpl.o \
monolib_oleutils.o \
@@ -12535,7 +12537,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \
@COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8)
COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \
coredll_generic_caret.o \
- coredll_generic_imaglist.o \
coredll_unix_dialup.o \
coredll_unix_fontenum.o \
coredll_unix_fontutil.o \
@@ -12547,7 +12548,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \
@COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4)
COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \
coredll_generic_caret.o \
- coredll_generic_imaglist.o \
coredll_unix_dialup.o \
coredll_unix_fontenum.o \
coredll_unix_fontutil.o \
@@ -12559,7 +12559,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \
@COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_1_4 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4)
COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_1_4 = \
coredll_generic_caret.o \
- coredll_generic_imaglist.o \
coredll_automtn.o \
coredll_comimpl.o \
coredll_oleutils.o \
@@ -12671,7 +12670,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \
@COND_PLATFORM_MACOSX_1@__OSX_COMMON_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9)
COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \
corelib_generic_caret.o \
- corelib_generic_imaglist.o \
corelib_unix_dialup.o \
corelib_unix_fontenum.o \
corelib_unix_fontutil.o \
@@ -12683,7 +12681,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \
@COND_PLATFORM_MACOSX_1@__GTK_PLATFORM_SRC_OBJECTS_2_2 = $(COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2)
COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \
corelib_generic_caret.o \
- corelib_generic_imaglist.o \
corelib_unix_dialup.o \
corelib_unix_fontenum.o \
corelib_unix_fontutil.o \
@@ -12695,7 +12692,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \
@COND_PLATFORM_UNIX_1@__GTK_PLATFORM_SRC_OBJECTS_2_2 = $(COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2)
COND_PLATFORM_WIN32_1___GTK_PLATFORM_SRC_OBJECTS_2_2 = \
corelib_generic_caret.o \
- corelib_generic_imaglist.o \
corelib_automtn.o \
corelib_comimpl.o \
corelib_oleutils.o \
@@ -15156,9 +15152,6 @@ monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
-monodll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
@@ -15282,9 +15275,6 @@ monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-monodll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
@@ -15330,8 +15320,8 @@ monodll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-monodll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
@@ -16557,48 +16547,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -17385,9 +17333,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
@@ -17487,6 +17432,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
@@ -18414,6 +18368,27 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -19920,9 +19895,6 @@ monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
-monolib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
@@ -20046,9 +20018,6 @@ monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-monolib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
@@ -20094,8 +20063,8 @@ monolib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-monolib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
@@ -21321,48 +21290,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -22149,9 +22076,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
@@ -22251,6 +22175,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
@@ -23178,6 +23111,27 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -25365,9 +25319,6 @@ coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
-coredll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
@@ -25491,9 +25442,6 @@ coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-coredll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
@@ -25539,8 +25487,8 @@ coredll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(COREDLL_ODEP)
coredll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-coredll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
@@ -26184,48 +26132,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -27012,9 +26918,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
@@ -27114,6 +27017,15 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
@@ -28041,6 +27953,27 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -29100,9 +29033,6 @@ corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
-corelib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
-
corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
@@ -29226,9 +29156,6 @@ corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-corelib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
-
corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
@@ -29274,8 +29201,8 @@ corelib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(CORELIB_ODEP)
corelib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
-corelib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
@@ -29919,48 +29846,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -30747,9 +30632,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
@@ -30849,6 +30731,15 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_darkmode.o: $(srcdir)/src/msw/darkmode.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/darkmode.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_appprogress.o: $(srcdir)/src/msw/appprogress.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/appprogress.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbarbutton.o: $(srcdir)/src/msw/taskbarbutton.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/taskbarbutton.cpp
+
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
@@ -31776,6 +31667,27 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gtk_srchctrl.o: $(srcdir)/src/gtk/srchctrl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/srchctrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c509ba3483..bb0c852118 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1334,7 +1334,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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!
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!
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!
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
$(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
$(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
@@ -1764,6 +1761,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/ole/access.cpp
src/msw/bmpbndl.cpp
src/msw/overlay.cpp
+ src/msw/darkmode.cpp
+ src/msw/appprogress.cpp
+ src/msw/taskbarbutton.cpp
wx/msw/nonownedwnd.h
@@ -1777,6 +1777,46 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/sound.h
wx/msw/joystick.h
wx/msw/evtloop.h
+ wx/msw/taskbarbutton.h
+ wx/msw/gdiimage.h
+ wx/msw/dib.h
+ wx/msw/ole/droptgt.h
+ wx/msw/icon.h
+ wx/msw/toplevel.h
+ wx/msw/darkmode.h
+ wx/msw/dcprint.h
+ wx/msw/tooltip.h
+ wx/msw/ole/dataform.h
+ wx/msw/region.h
+ wx/msw/clipbrd.h
+ wx/msw/app.h
+ wx/msw/ole/oleutils.h
+ wx/msw/dcscreen.h
+ wx/msw/dcclient.h
+ wx/msw/font.h
+ wx/msw/ole/safearray.h
+ wx/msw/colour.h
+ wx/msw/ole/access.h
+ wx/msw/ole/dataobj2.h
+ wx/msw/dc.h
+ wx/msw/brush.h
+ wx/msw/ole/dataobj.h
+ wx/msw/cursor.h
+ wx/msw/ole/dropsrc.h
+ wx/msw/printwin.h
+ wx/msw/printdlg.h
+ wx/msw/dcmemory.h
+ wx/msw/appprogress.h
+ wx/msw/caret.h
+ wx/msw/window.h
+ wx/msw/bitmap.h
+ wx/msw/pen.h
+ wx/msw/enhmeta.h
+ wx/msw/ole/comimpl.h
+ wx/msw/palette.h
+ wx/msw/minifram.h
+ wx/msw/ctrlsub.h
+ wx/msw/init.h
@@ -1788,7 +1828,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/prntdlgg.cpp
src/msw/accel.cpp
src/msw/anybutton.cpp
- src/msw/appprogress.cpp
src/msw/artmsw.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
@@ -1830,7 +1869,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
- src/msw/taskbarbutton.cpp
src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
@@ -1847,7 +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/darkmode.cpp
+ src/msw/imaglist.cpp
wx/generic/clrpickerg.h
@@ -1856,41 +1894,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/fontpickerg.h
wx/msw/accel.h
wx/msw/anybutton.h
- wx/msw/app.h
- wx/msw/appprogress.h
- wx/msw/bitmap.h
wx/msw/bmpbuttn.h
- wx/msw/brush.h
wx/msw/button.h
- wx/msw/caret.h
wx/msw/checkbox.h
wx/msw/choice.h
- wx/msw/clipbrd.h
wx/msw/colordlg.h
- wx/msw/colour.h
wx/msw/combo.h
wx/msw/combobox.h
wx/msw/control.h
- wx/msw/ctrlsub.h
- wx/msw/cursor.h
wx/msw/custombgwin.h
- wx/msw/dc.h
- wx/msw/dcclient.h
- wx/msw/dcmemory.h
- wx/msw/dcprint.h
- wx/msw/dcscreen.h
wx/msw/dialog.h
- wx/msw/dib.h
wx/msw/dirdlg.h
wx/msw/dragimag.h
- wx/msw/enhmeta.h
wx/msw/filedlg.h
- wx/msw/font.h
wx/msw/frame.h
wx/msw/gauge.h
- wx/msw/gdiimage.h
wx/msw/headerctrl.h
- wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
wx/msw/init.h
@@ -1900,30 +1919,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/menu.h
wx/msw/menuitem.h
wx/msw/metafile.h
- wx/msw/minifram.h
wx/msw/missing.h
wx/msw/msgdlg.h
wx/msw/msvcrt.h
wx/msw/notebook.h
- wx/msw/ole/access.h
- wx/msw/ole/comimpl.h
- wx/msw/ole/dataform.h
- wx/msw/ole/dataobj.h
- wx/msw/ole/dataobj2.h
- wx/msw/ole/dropsrc.h
- wx/msw/ole/droptgt.h
- wx/msw/ole/oleutils.h
- wx/msw/ole/safearray.h
wx/msw/ownerdrw.h
wx/msw/ownerdrawnbutton.h
- wx/msw/palette.h
- wx/msw/pen.h
- wx/msw/printdlg.h
- wx/msw/printwin.h
wx/msw/progdlg.h
wx/msw/radiobox.h
wx/msw/radiobut.h
- wx/msw/region.h
wx/msw/rcdefs.h
wx/msw/richmsgdlg.h
wx/msw/scrolbar.h
@@ -1935,15 +1939,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
- wx/msw/taskbarbutton.h
wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h
wx/msw/tglbtn.h
- wx/msw/tooltip.h
- wx/msw/toplevel.h
wx/msw/treectrl.h
- wx/msw/window.h
wx/msw/rt/utils.h
wx/msw/hyperlink.h
wx/msw/bmpcbox.h
@@ -1953,7 +1953,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/datectrl.h
wx/msw/calctrl.h
wx/generic/activityindicator.h
- wx/msw/darkmode.h
@@ -2014,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
@@ -2044,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
@@ -2460,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
wx/generic/accel.h
@@ -2518,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
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index c2c4c53a2a..c1080685ce 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -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
@@ -1640,6 +1637,9 @@ set(MSW_LOWLEVEL_SRC
src/msw/ole/access.cpp
src/msw/bmpbndl.cpp
src/msw/overlay.cpp
+ src/msw/darkmode.cpp
+ src/msw/appprogress.cpp
+ src/msw/taskbarbutton.cpp
)
set(MSW_LOWLEVEL_HDR
@@ -1654,6 +1654,46 @@ set(MSW_LOWLEVEL_HDR
wx/msw/helpwin.h
wx/msw/taskbar.h
wx/msw/evtloop.h
+ wx/msw/taskbarbutton.h
+ wx/msw/gdiimage.h
+ wx/msw/font.h
+ wx/msw/ole/safearray.h
+ wx/msw/colour.h
+ wx/msw/ole/access.h
+ wx/msw/clipbrd.h
+ wx/msw/app.h
+ wx/msw/ole/oleutils.h
+ wx/msw/dcscreen.h
+ wx/msw/dcclient.h
+ wx/msw/icon.h
+ wx/msw/toplevel.h
+ wx/msw/darkmode.h
+ wx/msw/tooltip.h
+ wx/msw/dcprint.h
+ wx/msw/ole/dataform.h
+ wx/msw/region.h
+ wx/msw/dib.h
+ wx/msw/ole/droptgt.h
+ wx/msw/enhmeta.h
+ wx/msw/ole/comimpl.h
+ wx/msw/palette.h
+ wx/msw/minifram.h
+ wx/msw/window.h
+ wx/msw/bitmap.h
+ wx/msw/pen.h
+ wx/msw/printwin.h
+ wx/msw/printdlg.h
+ wx/msw/dcmemory.h
+ wx/msw/appprogress.h
+ wx/msw/caret.h
+ wx/msw/ole/dataobj2.h
+ wx/msw/dc.h
+ wx/msw/ole/dataobj.h
+ wx/msw/brush.h
+ wx/msw/cursor.h
+ wx/msw/ole/dropsrc.h
+ wx/msw/init.h
+ wx/msw/ctrlsub.h
)
set(MSW_DESKTOP_LOWLEVEL_SRC
@@ -1677,7 +1717,6 @@ set(MSW_SRC
src/generic/prntdlgg.cpp
src/msw/accel.cpp
src/msw/anybutton.cpp
- src/msw/appprogress.cpp
src/msw/artmsw.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
@@ -1721,7 +1760,6 @@ set(MSW_SRC
src/msw/statline.cpp
src/msw/stattext.cpp
src/msw/systhemectrl.cpp
- src/msw/taskbarbutton.cpp
src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
@@ -1736,7 +1774,7 @@ set(MSW_SRC
src/msw/datetimectrl.cpp
src/msw/hyperlink.cpp
src/generic/activityindicator.cpp
- src/msw/darkmode.cpp
+ src/msw/imaglist.cpp
)
set(MSW_HDR
@@ -1746,41 +1784,22 @@ set(MSW_HDR
wx/generic/fontpickerg.h
wx/msw/accel.h
wx/msw/anybutton.h
- wx/msw/app.h
- wx/msw/appprogress.h
- wx/msw/bitmap.h
wx/msw/bmpbuttn.h
- wx/msw/brush.h
wx/msw/button.h
- wx/msw/caret.h
wx/msw/checkbox.h
wx/msw/choice.h
- wx/msw/clipbrd.h
wx/msw/colordlg.h
- wx/msw/colour.h
wx/msw/combo.h
wx/msw/combobox.h
wx/msw/control.h
- wx/msw/ctrlsub.h
- wx/msw/cursor.h
wx/msw/custombgwin.h
- wx/msw/dc.h
- wx/msw/dcclient.h
- wx/msw/dcmemory.h
- wx/msw/dcprint.h
- wx/msw/dcscreen.h
wx/msw/dialog.h
- wx/msw/dib.h
wx/msw/dirdlg.h
wx/msw/dragimag.h
- wx/msw/enhmeta.h
wx/msw/filedlg.h
- wx/msw/font.h
wx/msw/frame.h
wx/msw/gauge.h
- wx/msw/gdiimage.h
wx/msw/headerctrl.h
- wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
wx/msw/init.h
@@ -1790,30 +1809,15 @@ set(MSW_HDR
wx/msw/menu.h
wx/msw/menuitem.h
wx/msw/metafile.h
- wx/msw/minifram.h
wx/msw/missing.h
wx/msw/msgdlg.h
wx/msw/msvcrt.h
wx/msw/notebook.h
- wx/msw/ole/access.h
- wx/msw/ole/comimpl.h
- wx/msw/ole/dataform.h
- wx/msw/ole/dataobj.h
- wx/msw/ole/dataobj2.h
- wx/msw/ole/dropsrc.h
- wx/msw/ole/droptgt.h
- wx/msw/ole/oleutils.h
- wx/msw/ole/safearray.h
wx/msw/ownerdrw.h
wx/msw/ownerdrawnbutton.h
- wx/msw/palette.h
- wx/msw/pen.h
- wx/msw/printdlg.h
- wx/msw/printwin.h
wx/msw/progdlg.h
wx/msw/radiobox.h
wx/msw/radiobut.h
- wx/msw/region.h
wx/msw/rcdefs.h
wx/msw/richmsgdlg.h
wx/msw/rt/utils.h
@@ -1826,15 +1830,11 @@ set(MSW_HDR
wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
- wx/msw/taskbarbutton.h
wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h
wx/msw/tglbtn.h
- wx/msw/tooltip.h
- wx/msw/toplevel.h
wx/msw/treectrl.h
- wx/msw/window.h
wx/msw/calctrl.h
wx/msw/bmpcbox.h
wx/msw/datectrl.h
@@ -1843,7 +1843,6 @@ set(MSW_HDR
wx/msw/datetimectrl.h
wx/msw/timectrl.h
wx/generic/activityindicator.h
- wx/msw/darkmode.h
)
set(MSW_RSC
@@ -1900,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
@@ -1930,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
@@ -2326,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
@@ -2385,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
diff --git a/build/files b/build/files
index 3d5b95ba16..f603fe1303 100644
--- a/build/files
+++ b/build/files
@@ -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
@@ -1582,6 +1580,7 @@ MSW_LOWLEVEL_SRC =
src/common/taskbarcmn.cpp
src/msw/aboutdlg.cpp
src/msw/app.cpp
+ src/msw/appprogress.cpp
src/msw/bitmap.cpp
src/msw/bmpbndl.cpp
src/msw/brush.cpp
@@ -1589,6 +1588,7 @@ MSW_LOWLEVEL_SRC =
src/msw/clipbrd.cpp
src/msw/colour.cpp
src/msw/cursor.cpp
+ src/msw/darkmode.cpp
src/msw/data.cpp
src/msw/dc.cpp
src/msw/dcclient.cpp
@@ -1610,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
@@ -1639,6 +1638,7 @@ MSW_LOWLEVEL_SRC =
src/msw/settings.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
+ src/msw/taskbarbutton.cpp
src/msw/textmeasure.cpp
src/msw/tooltip.cpp
src/msw/toplevel.cpp
@@ -1649,17 +1649,57 @@ MSW_LOWLEVEL_SRC =
src/msw/window.cpp
MSW_LOWLEVEL_HDR =
+ wx/msw/app.h
+ wx/msw/appprogress.h
+ wx/msw/bitmap.h
+ wx/msw/brush.h
+ wx/msw/caret.h
+ wx/msw/clipbrd.h
+ wx/msw/colour.h
+ wx/msw/ctrlsub.h
+ wx/msw/cursor.h
+ wx/msw/darkmode.h
+ wx/msw/dc.h
+ wx/msw/dcclient.h
+ wx/msw/dcmemory.h
+ wx/msw/dcprint.h
+ wx/msw/dcscreen.h
+ wx/msw/dib.h
+ wx/msw/enhmeta.h
wx/msw/evtloop.h
+ wx/msw/font.h
+ wx/msw/icon.h
+ wx/msw/init.h
+ wx/msw/gdiimage.h
wx/msw/helpchm.h
wx/msw/helpwin.h
wx/msw/htmlhelp.h
wx/msw/joystick.h
+ wx/msw/minifram.h
wx/msw/nonownedwnd.h
+ wx/msw/ole/access.h
wx/msw/ole/activex.h
+ wx/msw/ole/comimpl.h
+ wx/msw/ole/dataform.h
+ wx/msw/ole/dataobj.h
+ wx/msw/ole/dataobj2.h
+ wx/msw/ole/dropsrc.h
+ wx/msw/ole/droptgt.h
+ wx/msw/ole/oleutils.h
+ wx/msw/ole/safearray.h
+ wx/msw/palette.h
+ wx/msw/pen.h
wx/msw/popupwin.h
+ wx/msw/printdlg.h
+ wx/msw/printwin.h
+ wx/msw/region.h
wx/msw/sound.h
wx/msw/taskbar.h
+ wx/msw/taskbarbutton.h
+ wx/msw/tooltip.h
+ wx/msw/toplevel.h
wx/msw/uxtheme.h
+ wx/msw/window.h
MSW_SRC =
src/generic/activityindicator.cpp
@@ -1671,7 +1711,6 @@ MSW_SRC =
src/generic/statusbr.cpp
src/msw/accel.cpp
src/msw/anybutton.cpp
- src/msw/appprogress.cpp
src/msw/artmsw.cpp
src/msw/bmpbuttn.cpp
src/msw/bmpcbox.cpp
@@ -1685,7 +1724,6 @@ MSW_SRC =
src/msw/commandlinkbutton.cpp
src/msw/control.cpp
src/msw/customdraw.cpp
- src/msw/darkmode.cpp
src/msw/datecontrols.cpp
src/msw/datectrl.cpp
src/msw/datetimectrl.cpp
@@ -1697,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
@@ -1723,7 +1762,6 @@ MSW_SRC =
src/msw/stattext.cpp
src/msw/statusbar.cpp
src/msw/systhemectrl.cpp
- src/msw/taskbarbutton.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
src/msw/tglbtn.cpp
@@ -1739,48 +1777,28 @@ MSW_HDR =
wx/generic/fontpickerg.h
wx/msw/accel.h
wx/msw/anybutton.h
- wx/msw/app.h
- wx/msw/appprogress.h
- wx/msw/bitmap.h
wx/msw/bmpbuttn.h
wx/msw/bmpcbox.h
- wx/msw/brush.h
wx/msw/button.h
wx/msw/calctrl.h
- wx/msw/caret.h
wx/msw/checkbox.h
wx/msw/choice.h
- wx/msw/clipbrd.h
wx/msw/colordlg.h
- wx/msw/colour.h
wx/msw/combo.h
wx/msw/combobox.h
wx/msw/commandlinkbutton.h
wx/msw/control.h
- wx/msw/ctrlsub.h
- wx/msw/cursor.h
wx/msw/custombgwin.h
- wx/msw/darkmode.h
wx/msw/datectrl.h
wx/msw/datetimectrl.h
- wx/msw/dc.h
- wx/msw/dcclient.h
- wx/msw/dcmemory.h
- wx/msw/dcprint.h
- wx/msw/dcscreen.h
wx/msw/dialog.h
- wx/msw/dib.h
wx/msw/dirdlg.h
wx/msw/dragimag.h
- wx/msw/enhmeta.h
wx/msw/filedlg.h
- wx/msw/font.h
wx/msw/frame.h
wx/msw/gauge.h
- wx/msw/gdiimage.h
wx/msw/headerctrl.h
wx/msw/hyperlink.h
- wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
wx/msw/init.h
@@ -1790,31 +1808,16 @@ MSW_HDR =
wx/msw/menu.h
wx/msw/menuitem.h
wx/msw/metafile.h
- wx/msw/minifram.h
wx/msw/missing.h
wx/msw/msgdlg.h
wx/msw/msvcrt.h
wx/msw/notebook.h
- wx/msw/ole/access.h
- wx/msw/ole/comimpl.h
- wx/msw/ole/dataform.h
- wx/msw/ole/dataobj.h
- wx/msw/ole/dataobj2.h
- wx/msw/ole/dropsrc.h
- wx/msw/ole/droptgt.h
- wx/msw/ole/oleutils.h
- wx/msw/ole/safearray.h
wx/msw/ownerdrawnbutton.h
wx/msw/ownerdrw.h
- wx/msw/palette.h
- wx/msw/pen.h
- wx/msw/printdlg.h
- wx/msw/printwin.h
wx/msw/progdlg.h
wx/msw/radiobox.h
wx/msw/radiobut.h
wx/msw/rcdefs.h
- wx/msw/region.h
wx/msw/richmsgdlg.h
wx/msw/rt/utils.h
wx/msw/scrolbar.h
@@ -1826,16 +1829,12 @@ MSW_HDR =
wx/msw/statline.h
wx/msw/stattext.h
wx/msw/statusbar.h
- wx/msw/taskbarbutton.h
wx/msw/textctrl.h
wx/msw/textentry.h
wx/msw/tglbtn.h
wx/msw/timectrl.h
wx/msw/toolbar.h
- wx/msw/tooltip.h
- wx/msw/toplevel.h
wx/msw/treectrl.h
- wx/msw/window.h
MSW_RSC =
# Resources must be installed together with headers:
@@ -1890,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
@@ -1918,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
@@ -2269,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
@@ -2321,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
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index c0847c68d2..f5957fe6b7 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -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 \
@@ -1939,6 +1938,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_msw_bmpbndl.o \
$(OBJS)\monodll_overlay.o \
+ $(OBJS)\monodll_darkmode.o \
+ $(OBJS)\monodll_appprogress.o \
+ $(OBJS)\monodll_taskbarbutton.o \
$(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_collpaneg.o \
$(OBJS)\monodll_filepickerg.o \
@@ -1947,7 +1949,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_prntdlgg.o \
$(OBJS)\monodll_msw_accel.o \
$(OBJS)\monodll_msw_anybutton.o \
- $(OBJS)\monodll_appprogress.o \
$(OBJS)\monodll_artmsw.o \
$(OBJS)\monodll_msw_bmpbuttn.o \
$(OBJS)\monodll_msw_button.o \
@@ -1989,7 +1990,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_statusbar.o \
$(OBJS)\monodll_msw_statline.o \
$(OBJS)\monodll_msw_stattext.o \
- $(OBJS)\monodll_taskbarbutton.o \
$(OBJS)\monodll_msw_toolbar.o \
$(OBJS)\monodll_msw_textctrl.o \
$(OBJS)\monodll_textentry.o \
@@ -2006,7 +2006,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_timectrl.o \
$(OBJS)\monodll_datecontrols.o \
$(OBJS)\monodll_activityindicator.o \
- $(OBJS)\monodll_darkmode.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 \
@@ -2287,6 +2286,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_msw_bmpbndl.o \
$(OBJS)\monodll_overlay.o \
+ $(OBJS)\monodll_darkmode.o \
+ $(OBJS)\monodll_appprogress.o \
+ $(OBJS)\monodll_taskbarbutton.o \
$(OBJS)\monodll_generic_accel.o \
$(OBJS)\monodll_clrpickerg.o \
$(OBJS)\monodll_collpaneg.o \
@@ -2338,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 \
@@ -2748,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 \
@@ -2791,6 +2793,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_msw_bmpbndl.o \
$(OBJS)\monolib_overlay.o \
+ $(OBJS)\monolib_darkmode.o \
+ $(OBJS)\monolib_appprogress.o \
+ $(OBJS)\monolib_taskbarbutton.o \
$(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_collpaneg.o \
$(OBJS)\monolib_filepickerg.o \
@@ -2799,7 +2804,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_prntdlgg.o \
$(OBJS)\monolib_msw_accel.o \
$(OBJS)\monolib_msw_anybutton.o \
- $(OBJS)\monolib_appprogress.o \
$(OBJS)\monolib_artmsw.o \
$(OBJS)\monolib_msw_bmpbuttn.o \
$(OBJS)\monolib_msw_button.o \
@@ -2841,7 +2845,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_statusbar.o \
$(OBJS)\monolib_msw_statline.o \
$(OBJS)\monolib_msw_stattext.o \
- $(OBJS)\monolib_taskbarbutton.o \
$(OBJS)\monolib_msw_toolbar.o \
$(OBJS)\monolib_msw_textctrl.o \
$(OBJS)\monolib_textentry.o \
@@ -2858,7 +2861,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_timectrl.o \
$(OBJS)\monolib_datecontrols.o \
$(OBJS)\monolib_activityindicator.o \
- $(OBJS)\monolib_darkmode.o \
+ $(OBJS)\monolib_msw_imaglist.o \
$(OBJS)\monolib_msw_checklst.o \
$(OBJS)\monolib_msw_fdrepdlg.o \
$(OBJS)\monolib_fontdlg.o \
@@ -3096,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 \
@@ -3139,6 +3141,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_msw_bmpbndl.o \
$(OBJS)\monolib_overlay.o \
+ $(OBJS)\monolib_darkmode.o \
+ $(OBJS)\monolib_appprogress.o \
+ $(OBJS)\monolib_taskbarbutton.o \
$(OBJS)\monolib_generic_accel.o \
$(OBJS)\monolib_clrpickerg.o \
$(OBJS)\monolib_collpaneg.o \
@@ -3190,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 \
@@ -3479,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 \
@@ -3522,6 +3527,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_msw_bmpbndl.o \
$(OBJS)\coredll_overlay.o \
+ $(OBJS)\coredll_darkmode.o \
+ $(OBJS)\coredll_appprogress.o \
+ $(OBJS)\coredll_taskbarbutton.o \
$(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_collpaneg.o \
$(OBJS)\coredll_filepickerg.o \
@@ -3530,7 +3538,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_prntdlgg.o \
$(OBJS)\coredll_msw_accel.o \
$(OBJS)\coredll_msw_anybutton.o \
- $(OBJS)\coredll_appprogress.o \
$(OBJS)\coredll_artmsw.o \
$(OBJS)\coredll_msw_bmpbuttn.o \
$(OBJS)\coredll_msw_button.o \
@@ -3572,7 +3579,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_statusbar.o \
$(OBJS)\coredll_msw_statline.o \
$(OBJS)\coredll_msw_stattext.o \
- $(OBJS)\coredll_taskbarbutton.o \
$(OBJS)\coredll_msw_toolbar.o \
$(OBJS)\coredll_msw_textctrl.o \
$(OBJS)\coredll_textentry.o \
@@ -3589,7 +3595,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_timectrl.o \
$(OBJS)\coredll_datecontrols.o \
$(OBJS)\coredll_activityindicator.o \
- $(OBJS)\coredll_darkmode.o \
+ $(OBJS)\coredll_msw_imaglist.o \
$(OBJS)\coredll_msw_checklst.o \
$(OBJS)\coredll_msw_fdrepdlg.o \
$(OBJS)\coredll_fontdlg.o \
@@ -3827,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 \
@@ -3870,6 +3875,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_msw_bmpbndl.o \
$(OBJS)\coredll_overlay.o \
+ $(OBJS)\coredll_darkmode.o \
+ $(OBJS)\coredll_appprogress.o \
+ $(OBJS)\coredll_taskbarbutton.o \
$(OBJS)\coredll_generic_accel.o \
$(OBJS)\coredll_clrpickerg.o \
$(OBJS)\coredll_collpaneg.o \
@@ -3921,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 \
@@ -4167,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 \
@@ -4210,6 +4218,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_msw_bmpbndl.o \
$(OBJS)\corelib_overlay.o \
+ $(OBJS)\corelib_darkmode.o \
+ $(OBJS)\corelib_appprogress.o \
+ $(OBJS)\corelib_taskbarbutton.o \
$(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_collpaneg.o \
$(OBJS)\corelib_filepickerg.o \
@@ -4218,7 +4229,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_prntdlgg.o \
$(OBJS)\corelib_msw_accel.o \
$(OBJS)\corelib_msw_anybutton.o \
- $(OBJS)\corelib_appprogress.o \
$(OBJS)\corelib_artmsw.o \
$(OBJS)\corelib_msw_bmpbuttn.o \
$(OBJS)\corelib_msw_button.o \
@@ -4260,7 +4270,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_statusbar.o \
$(OBJS)\corelib_msw_statline.o \
$(OBJS)\corelib_msw_stattext.o \
- $(OBJS)\corelib_taskbarbutton.o \
$(OBJS)\corelib_msw_toolbar.o \
$(OBJS)\corelib_msw_textctrl.o \
$(OBJS)\corelib_textentry.o \
@@ -4277,7 +4286,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_timectrl.o \
$(OBJS)\corelib_datecontrols.o \
$(OBJS)\corelib_activityindicator.o \
- $(OBJS)\corelib_darkmode.o \
+ $(OBJS)\corelib_msw_imaglist.o \
$(OBJS)\corelib_msw_checklst.o \
$(OBJS)\corelib_msw_fdrepdlg.o \
$(OBJS)\corelib_fontdlg.o \
@@ -4515,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 \
@@ -4558,6 +4566,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_msw_bmpbndl.o \
$(OBJS)\corelib_overlay.o \
+ $(OBJS)\corelib_darkmode.o \
+ $(OBJS)\corelib_appprogress.o \
+ $(OBJS)\corelib_taskbarbutton.o \
$(OBJS)\corelib_generic_accel.o \
$(OBJS)\corelib_clrpickerg.o \
$(OBJS)\corelib_collpaneg.o \
@@ -4609,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 \
@@ -7365,9 +7377,6 @@ $(OBJS)\monodll_msw_accel.o: ../../src/msw/accel.cpp
$(OBJS)\monodll_msw_anybutton.o: ../../src/msw/anybutton.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monodll_appprogress.o: ../../src/msw/appprogress.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\monodll_artmsw.o: ../../src/msw/artmsw.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7491,9 +7500,6 @@ $(OBJS)\monodll_msw_statline.o: ../../src/msw/statline.cpp
$(OBJS)\monodll_msw_stattext.o: ../../src/msw/stattext.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monodll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\monodll_msw_toolbar.o: ../../src/msw/toolbar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7539,7 +7545,7 @@ $(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monodll_darkmode.o: ../../src/msw/darkmode.cpp
+$(OBJS)\monodll_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_msw_checklst.o: ../../src/msw/checklst.cpp
@@ -7686,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) $<
@@ -8285,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) $<
@@ -8500,6 +8504,21 @@ $(OBJS)\monodll_overlay.o: ../../src/msw/overlay.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_darkmode.o: ../../src/msw/darkmode.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_appprogress.o: ../../src/msw/appprogress.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9952,9 +9971,6 @@ $(OBJS)\monolib_msw_accel.o: ../../src/msw/accel.cpp
$(OBJS)\monolib_msw_anybutton.o: ../../src/msw/anybutton.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monolib_appprogress.o: ../../src/msw/appprogress.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\monolib_artmsw.o: ../../src/msw/artmsw.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10078,9 +10094,6 @@ $(OBJS)\monolib_msw_statline.o: ../../src/msw/statline.cpp
$(OBJS)\monolib_msw_stattext.o: ../../src/msw/stattext.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monolib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\monolib_msw_toolbar.o: ../../src/msw/toolbar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10126,7 +10139,7 @@ $(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monolib_darkmode.o: ../../src/msw/darkmode.cpp
+$(OBJS)\monolib_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_msw_checklst.o: ../../src/msw/checklst.cpp
@@ -10273,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) $<
@@ -10872,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) $<
@@ -11087,6 +11098,21 @@ $(OBJS)\monolib_overlay.o: ../../src/msw/overlay.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_darkmode.o: ../../src/msw/darkmode.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_appprogress.o: ../../src/msw/appprogress.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12962,9 +12988,6 @@ $(OBJS)\coredll_msw_accel.o: ../../src/msw/accel.cpp
$(OBJS)\coredll_msw_anybutton.o: ../../src/msw/anybutton.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\coredll_appprogress.o: ../../src/msw/appprogress.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\coredll_artmsw.o: ../../src/msw/artmsw.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13088,9 +13111,6 @@ $(OBJS)\coredll_msw_statline.o: ../../src/msw/statline.cpp
$(OBJS)\coredll_msw_stattext.o: ../../src/msw/stattext.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\coredll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\coredll_msw_toolbar.o: ../../src/msw/toolbar.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13136,7 +13156,7 @@ $(OBJS)\coredll_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\coredll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\coredll_darkmode.o: ../../src/msw/darkmode.cpp
+$(OBJS)\coredll_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_msw_checklst.o: ../../src/msw/checklst.cpp
@@ -13283,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) $<
@@ -13420,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) $<
@@ -13635,6 +13653,21 @@ $(OBJS)\coredll_overlay.o: ../../src/msw/overlay.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_darkmode.o: ../../src/msw/darkmode.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_appprogress.o: ../../src/msw/appprogress.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14715,9 +14748,6 @@ $(OBJS)\corelib_msw_accel.o: ../../src/msw/accel.cpp
$(OBJS)\corelib_msw_anybutton.o: ../../src/msw/anybutton.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\corelib_appprogress.o: ../../src/msw/appprogress.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\corelib_artmsw.o: ../../src/msw/artmsw.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14841,9 +14871,6 @@ $(OBJS)\corelib_msw_statline.o: ../../src/msw/statline.cpp
$(OBJS)\corelib_msw_stattext.o: ../../src/msw/stattext.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\corelib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\corelib_msw_toolbar.o: ../../src/msw/toolbar.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14889,7 +14916,7 @@ $(OBJS)\corelib_timectrl.o: ../../src/msw/timectrl.cpp
$(OBJS)\corelib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\corelib_darkmode.o: ../../src/msw/darkmode.cpp
+$(OBJS)\corelib_msw_imaglist.o: ../../src/msw/imaglist.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_msw_checklst.o: ../../src/msw/checklst.cpp
@@ -15036,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) $<
@@ -15173,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) $<
@@ -15388,6 +15413,21 @@ $(OBJS)\corelib_overlay.o: ../../src/msw/overlay.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_darkmode.o: ../../src/msw/darkmode.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_appprogress.o: ../../src/msw/appprogress.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_taskbarbutton.o: ../../src/msw/taskbarbutton.cpp
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index bd339d93d5..c85985677d 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -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 \
@@ -2272,6 +2271,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_msw_bmpbndl.obj \
$(OBJS)\monodll_overlay.obj \
+ $(OBJS)\monodll_darkmode.obj \
+ $(OBJS)\monodll_appprogress.obj \
+ $(OBJS)\monodll_taskbarbutton.obj \
$(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_collpaneg.obj \
$(OBJS)\monodll_filepickerg.obj \
@@ -2280,7 +2282,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_prntdlgg.obj \
$(OBJS)\monodll_msw_accel.obj \
$(OBJS)\monodll_msw_anybutton.obj \
- $(OBJS)\monodll_appprogress.obj \
$(OBJS)\monodll_artmsw.obj \
$(OBJS)\monodll_msw_bmpbuttn.obj \
$(OBJS)\monodll_msw_button.obj \
@@ -2322,7 +2323,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_statusbar.obj \
$(OBJS)\monodll_msw_statline.obj \
$(OBJS)\monodll_msw_stattext.obj \
- $(OBJS)\monodll_taskbarbutton.obj \
$(OBJS)\monodll_msw_toolbar.obj \
$(OBJS)\monodll_msw_textctrl.obj \
$(OBJS)\monodll_textentry.obj \
@@ -2339,7 +2339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_timectrl.obj \
$(OBJS)\monodll_datecontrols.obj \
$(OBJS)\monodll_activityindicator.obj \
- $(OBJS)\monodll_darkmode.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 \
@@ -2618,6 +2617,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_msw_bmpbndl.obj \
$(OBJS)\monodll_overlay.obj \
+ $(OBJS)\monodll_darkmode.obj \
+ $(OBJS)\monodll_appprogress.obj \
+ $(OBJS)\monodll_taskbarbutton.obj \
$(OBJS)\monodll_generic_accel.obj \
$(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_collpaneg.obj \
@@ -2669,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 \
@@ -3081,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 \
@@ -3124,6 +3126,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_msw_bmpbndl.obj \
$(OBJS)\monolib_overlay.obj \
+ $(OBJS)\monolib_darkmode.obj \
+ $(OBJS)\monolib_appprogress.obj \
+ $(OBJS)\monolib_taskbarbutton.obj \
$(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_collpaneg.obj \
$(OBJS)\monolib_filepickerg.obj \
@@ -3132,7 +3137,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_prntdlgg.obj \
$(OBJS)\monolib_msw_accel.obj \
$(OBJS)\monolib_msw_anybutton.obj \
- $(OBJS)\monolib_appprogress.obj \
$(OBJS)\monolib_artmsw.obj \
$(OBJS)\monolib_msw_bmpbuttn.obj \
$(OBJS)\monolib_msw_button.obj \
@@ -3174,7 +3178,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_statusbar.obj \
$(OBJS)\monolib_msw_statline.obj \
$(OBJS)\monolib_msw_stattext.obj \
- $(OBJS)\monolib_taskbarbutton.obj \
$(OBJS)\monolib_msw_toolbar.obj \
$(OBJS)\monolib_msw_textctrl.obj \
$(OBJS)\monolib_textentry.obj \
@@ -3191,7 +3194,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_timectrl.obj \
$(OBJS)\monolib_datecontrols.obj \
$(OBJS)\monolib_activityindicator.obj \
- $(OBJS)\monolib_darkmode.obj \
+ $(OBJS)\monolib_msw_imaglist.obj \
$(OBJS)\monolib_msw_checklst.obj \
$(OBJS)\monolib_msw_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
@@ -3427,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 \
@@ -3470,6 +3472,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_msw_bmpbndl.obj \
$(OBJS)\monolib_overlay.obj \
+ $(OBJS)\monolib_darkmode.obj \
+ $(OBJS)\monolib_appprogress.obj \
+ $(OBJS)\monolib_taskbarbutton.obj \
$(OBJS)\monolib_generic_accel.obj \
$(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_collpaneg.obj \
@@ -3521,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 \
@@ -3862,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 \
@@ -3905,6 +3910,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_msw_bmpbndl.obj \
$(OBJS)\coredll_overlay.obj \
+ $(OBJS)\coredll_darkmode.obj \
+ $(OBJS)\coredll_appprogress.obj \
+ $(OBJS)\coredll_taskbarbutton.obj \
$(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_collpaneg.obj \
$(OBJS)\coredll_filepickerg.obj \
@@ -3913,7 +3921,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_prntdlgg.obj \
$(OBJS)\coredll_msw_accel.obj \
$(OBJS)\coredll_msw_anybutton.obj \
- $(OBJS)\coredll_appprogress.obj \
$(OBJS)\coredll_artmsw.obj \
$(OBJS)\coredll_msw_bmpbuttn.obj \
$(OBJS)\coredll_msw_button.obj \
@@ -3955,7 +3962,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_statusbar.obj \
$(OBJS)\coredll_msw_statline.obj \
$(OBJS)\coredll_msw_stattext.obj \
- $(OBJS)\coredll_taskbarbutton.obj \
$(OBJS)\coredll_msw_toolbar.obj \
$(OBJS)\coredll_msw_textctrl.obj \
$(OBJS)\coredll_textentry.obj \
@@ -3972,7 +3978,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_timectrl.obj \
$(OBJS)\coredll_datecontrols.obj \
$(OBJS)\coredll_activityindicator.obj \
- $(OBJS)\coredll_darkmode.obj \
+ $(OBJS)\coredll_msw_imaglist.obj \
$(OBJS)\coredll_msw_checklst.obj \
$(OBJS)\coredll_msw_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
@@ -4208,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 \
@@ -4251,6 +4256,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_msw_bmpbndl.obj \
$(OBJS)\coredll_overlay.obj \
+ $(OBJS)\coredll_darkmode.obj \
+ $(OBJS)\coredll_appprogress.obj \
+ $(OBJS)\coredll_taskbarbutton.obj \
$(OBJS)\coredll_generic_accel.obj \
$(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_collpaneg.obj \
@@ -4302,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 \
@@ -4548,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 \
@@ -4591,6 +4599,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_msw_bmpbndl.obj \
$(OBJS)\corelib_overlay.obj \
+ $(OBJS)\corelib_darkmode.obj \
+ $(OBJS)\corelib_appprogress.obj \
+ $(OBJS)\corelib_taskbarbutton.obj \
$(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_collpaneg.obj \
$(OBJS)\corelib_filepickerg.obj \
@@ -4599,7 +4610,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_prntdlgg.obj \
$(OBJS)\corelib_msw_accel.obj \
$(OBJS)\corelib_msw_anybutton.obj \
- $(OBJS)\corelib_appprogress.obj \
$(OBJS)\corelib_artmsw.obj \
$(OBJS)\corelib_msw_bmpbuttn.obj \
$(OBJS)\corelib_msw_button.obj \
@@ -4641,7 +4651,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_statusbar.obj \
$(OBJS)\corelib_msw_statline.obj \
$(OBJS)\corelib_msw_stattext.obj \
- $(OBJS)\corelib_taskbarbutton.obj \
$(OBJS)\corelib_msw_toolbar.obj \
$(OBJS)\corelib_msw_textctrl.obj \
$(OBJS)\corelib_textentry.obj \
@@ -4658,7 +4667,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_timectrl.obj \
$(OBJS)\corelib_datecontrols.obj \
$(OBJS)\corelib_activityindicator.obj \
- $(OBJS)\corelib_darkmode.obj \
+ $(OBJS)\corelib_msw_imaglist.obj \
$(OBJS)\corelib_msw_checklst.obj \
$(OBJS)\corelib_msw_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
@@ -4894,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 \
@@ -4937,6 +4945,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_msw_bmpbndl.obj \
$(OBJS)\corelib_overlay.obj \
+ $(OBJS)\corelib_darkmode.obj \
+ $(OBJS)\corelib_appprogress.obj \
+ $(OBJS)\corelib_taskbarbutton.obj \
$(OBJS)\corelib_generic_accel.obj \
$(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_collpaneg.obj \
@@ -4988,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 \
@@ -7822,9 +7834,6 @@ $(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
$(OBJS)\monodll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
-$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
@@ -7948,9 +7957,6 @@ $(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
-$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
@@ -7996,8 +8002,8 @@ $(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_darkmode.obj: ..\..\src\msw\darkmode.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\darkmode.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
@@ -8143,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
@@ -8742,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
@@ -8957,6 +8961,21 @@ $(OBJS)\monodll_overlay.obj: ..\..\src\msw\overlay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\overlay.cpp
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_darkmode.obj: ..\..\src\msw\darkmode.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_appprogress.obj: ..\..\src\msw\appprogress.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -10409,9 +10428,6 @@ $(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
$(OBJS)\monolib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
-$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
@@ -10535,9 +10551,6 @@ $(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
-$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
@@ -10583,8 +10596,8 @@ $(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_darkmode.obj: ..\..\src\msw\darkmode.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\darkmode.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
@@ -10730,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
@@ -11329,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
@@ -11544,6 +11555,21 @@ $(OBJS)\monolib_overlay.obj: ..\..\src\msw\overlay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\overlay.cpp
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_darkmode.obj: ..\..\src\msw\darkmode.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_appprogress.obj: ..\..\src\msw\appprogress.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -13419,9 +13445,6 @@ $(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
$(OBJS)\coredll_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp
-$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
@@ -13545,9 +13568,6 @@ $(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
-$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
@@ -13593,8 +13613,8 @@ $(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_darkmode.obj: ..\..\src\msw\darkmode.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\darkmode.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
@@ -13740,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
@@ -13877,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
@@ -14092,6 +14110,21 @@ $(OBJS)\coredll_overlay.obj: ..\..\src\msw\overlay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\overlay.cpp
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_darkmode.obj: ..\..\src\msw\darkmode.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\darkmode.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_appprogress.obj: ..\..\src\msw\appprogress.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -15172,9 +15205,6 @@ $(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
$(OBJS)\corelib_msw_anybutton.obj: ..\..\src\msw\anybutton.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp
-$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
-
$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
@@ -15298,9 +15328,6 @@ $(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
-$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
-
$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
@@ -15346,8 +15373,8 @@ $(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_darkmode.obj: ..\..\src\msw\darkmode.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\darkmode.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
@@ -15493,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
@@ -15630,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
@@ -15845,6 +15870,21 @@ $(OBJS)\corelib_overlay.obj: ..\..\src\msw\overlay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\overlay.cpp
!endif
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_darkmode.obj: ..\..\src\msw\darkmode.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\darkmode.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_appprogress.obj: ..\..\src\msw\appprogress.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\appprogress.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_taskbarbutton.obj: ..\..\src\msw\taskbarbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\taskbarbutton.cpp
+!endif
+
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
diff --git a/include/wx/generic/aboutdlgg.h b/include/wx/generic/aboutdlgg.h
index a5a5801c4e..5183bb433a 100644
--- a/include/wx/generic/aboutdlgg.h
+++ b/include/wx/generic/aboutdlgg.h
@@ -17,6 +17,7 @@
#include "wx/dialog.h"
class WXDLLIMPEXP_FWD_CORE wxAboutDialogInfo;
+class WXDLLIMPEXP_FWD_CORE wxPanel;
class WXDLLIMPEXP_FWD_CORE wxSizer;
class WXDLLIMPEXP_FWD_CORE wxSizerFlags;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 5fd6a9f9a3..5a6ddc8051 100644
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -41,7 +41,7 @@ enum
#define wxIMAGELIST_DRAW_SELECTED 0x0004
#define wxIMAGELIST_DRAW_FOCUSED 0x0008
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/imaglist.h"
#define wxHAS_NATIVE_IMAGELIST
#else
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index b4ef2a05b4..3103e27d67 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2753,7 +2753,7 @@ bool wxStaticBoxSizer::CheckIfNonBoxChild(wxWindow* win) const
wxDumpWindow(win),
wxDumpWindow(win->GetParent()));
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
// Additionally, under MSW the windows inside a static box are not
// drawn at all when compositing is used, so we have to disable it.
//
@@ -2762,7 +2762,7 @@ bool wxStaticBoxSizer::CheckIfNonBoxChild(wxWindow* win) const
// this for compatibility in the first place, it seems better not
// to risk it.
win->MSWDisableComposited();
-#endif // __WXMSW__
+#endif // __WXMSW__ && !__WXUNIVERSAL__
return true;
}
diff --git a/src/msw/darkmode.cpp b/src/msw/darkmode.cpp
index 4efafba960..5efe19fa07 100644
--- a/src/msw/darkmode.cpp
+++ b/src/msw/darkmode.cpp
@@ -52,7 +52,9 @@
#include
+#if wxUSE_LOG_TRACE
static const char* TRACE_DARKMODE = "msw-darkmode";
+#endif // wxUSE_LOG_TRACE
#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 783547d918..882e8f32d7 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1709,7 +1709,7 @@ void wxWindowMSW::MSWAfterReparent()
void wxWindowMSW::MSWDisableComposited()
{
- for ( wxWindow* win = this; win; win = win->GetParent() )
+ for ( auto win = this; win; win = win->GetParent() )
{
// We never set WS_EX_COMPOSITED on TLWs, and we shouldn't recurse into
// different windows, so we can stop here.
diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 70b27679fa..221a04501f 100644
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -223,6 +223,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
wxRegion rgnUpdate = scrollbar->GetUpdateRegion();
{
+#if wxUSE_LOG_TRACE
wxRect rectUpdate = rgnUpdate.GetBox();
wxLogTrace(wxT("scrollbar"),
wxT("%s redraw: update box is (%d, %d)-(%d, %d)"),
@@ -231,6 +232,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
rectUpdate.GetTop(),
rectUpdate.GetRight(),
rectUpdate.GetBottom());
+#endif // wxUSE_LOG_TRACE
#if 0 //def WXDEBUG_SCROLLBAR
static bool s_refreshDebug = false;