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

Merge remote-tracking branch 'github/msw-univ-fixes'

Browse source 
Fix wxUniv/MSW build and a CI job for it.

See #23476.

Closes #23471.
This commit is contained in:
Vadim Zeitlin 2023-04-28 15:23:59 +02:00
commit bf9f8c70b9
13 changed files with 623 additions and 615 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/ci_msw_cross.yml vendored
View file

@ -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

560
Makefile.in
View file

File diff suppressed because it is too large Load diff

97
build/bakefiles/files.bkl
View file

@ -1334,7 +1334,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="XWIN_LOWLEVEL_SRC" hints="files">
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1346,7 +1345,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/sound.h
@ -1360,7 +1358,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="GTK_WIN32_SRC" hints="files">
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/ole/automtn.cpp
src/msw/ole/comimpl.cpp
src/msw/ole/oleutils.cpp
@ -1378,7 +1375,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="GTK_WIN32_HDR" hints="files">
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/ole/automtn.h
wx/msw/ole/comimpl.h
wx/msw/ole/oleutils.h
@ -1540,6 +1536,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/bmpcbox.cpp
src/gtk/animate.cpp
src/gtk/srchctrl.cpp
src/generic/imaglist.cpp
</set>
<set var="GTK2_SRC" hints="files">
$(GTK_SRC)
@ -1608,6 +1605,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/dataview.h
wx/gtk/dvrenderer.h
wx/gtk/srchctrl.h
wx/generic/imaglist.h
</set>
<set var="GTK2_HDR" hints="files">
$(GTK_HDR)
@ -1721,7 +1719,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/gdiplus.cpp
src/msw/graphics.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/minifram.cpp
src/msw/nonownedwnd.cpp
src/msw/ole/comimpl.cpp
@ -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
</set>
<set var="MSW_LOWLEVEL_HDR" hints="files">
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
</set>
<set var="MSW_SRC" hints="files">
@ -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
</set>
<set var="MSW_HDR" hints="files">
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
</set>
<set var="MSW_RSC" hints="files">
<!-- Resources must be installed together with headers: -->
@ -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
</set>
<set var="UNIV_HDR" hints="files">
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
</set>
<!-- ====================================================================== -->

97
build/cmake/files.cmake
View file

@ -1227,7 +1227,6 @@ set(UNIX_SRC
set(XWIN_LOWLEVEL_SRC
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1240,7 +1239,6 @@ set(XWIN_LOWLEVEL_SRC
set(XWIN_LOWLEVEL_HDR
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
wx/unix/sound.h
@ -1249,7 +1247,6 @@ set(XWIN_LOWLEVEL_HDR
set(GTK_WIN32_SRC
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/ole/automtn.cpp
src/msw/ole/comimpl.cpp
src/msw/ole/oleutils.cpp
@ -1268,7 +1265,6 @@ set(GTK_WIN32_SRC
set(GTK_WIN32_HDR
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/ole/automtn.h
wx/msw/ole/comimpl.h
wx/msw/ole/oleutils.h
@ -1424,6 +1420,7 @@ set(GTK_SRC
src/gtk/bmpcbox.cpp
src/gtk/hyperlink.cpp
src/gtk/srchctrl.cpp
src/generic/imaglist.cpp
)
set(GTK2_SRC
@ -1494,6 +1491,7 @@ set(GTK_HDR
wx/gtk/activityindicator.h
wx/gtk/hyperlink.h
wx/gtk/srchctrl.h
wx/generic/imaglist.h
)
set(GTK2_HDR
@ -1598,7 +1596,6 @@ set(MSW_LOWLEVEL_SRC
src/msw/graphics.cpp
src/msw/graphicsd2d.cpp
src/msw/icon.cpp
src/msw/imaglist.cpp
src/msw/minifram.cpp
src/msw/nonownedwnd.cpp
src/msw/ole/comimpl.cpp
@ -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

97
build/files
View file

@ -1243,7 +1243,6 @@ UNIX_SRC =
XWIN_LOWLEVEL_SRC =
src/common/taskbarcmn.cpp
src/generic/caret.cpp
src/generic/imaglist.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
@ -1254,7 +1253,6 @@ XWIN_LOWLEVEL_SRC =
XWIN_LOWLEVEL_HDR =
wx/generic/caret.h
wx/generic/imaglist.h
wx/unix/fontutil.h
wx/unix/joystick.h
wx/unix/sound.h
@ -1266,7 +1264,6 @@ XWIN_LOWLEVEL_HDR =
GTK_WIN32_SRC =
src/common/taskbarcmn.cpp
src/generic/caret.cpp
src/generic/imaglist.cpp
src/msw/dialup.cpp
src/msw/dib.cpp
src/msw/display.cpp
@ -1282,7 +1279,6 @@ GTK_WIN32_SRC =
src/unix/fontutil.cpp
GTK_WIN32_HDR =
wx/generic/caret.h
wx/generic/imaglist.h
wx/msw/dib.h
wx/msw/joystick.h
wx/msw/ole/automtn.h
@ -1371,6 +1367,7 @@ GTK_SRC =
src/generic/fdrepdlg.cpp
# Needed as long as we support GTK+ < 2.6
src/generic/filepickerg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
@ -1441,6 +1438,7 @@ GTK_HDR =
wx/generic/activityindicator.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
wx/generic/imaglist.h
wx/generic/listctrl.h
wx/generic/statusbr.h
wx/gtk/accel.h
@ -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

176
build/msw/makefile.gcc
View file

@ -1896,7 +1896,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.o \
$(OBJS)\monodll_graphics.o \
$(OBJS)\monodll_icon.o \
$(OBJS)\monodll_imaglist.o \
$(OBJS)\monodll_minifram.o \
$(OBJS)\monodll_nonownedwnd.o \
$(OBJS)\monodll_comimpl.o \
@ -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) $<

184
build/msw/makefile.vc
View file

@ -2229,7 +2229,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_gdiplus.obj \
$(OBJS)\monodll_graphics.obj \
$(OBJS)\monodll_icon.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_minifram.obj \
$(OBJS)\monodll_nonownedwnd.obj \
$(OBJS)\monodll_comimpl.obj \
@ -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

1
include/wx/generic/aboutdlgg.h
View file

@ -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;

2
include/wx/imaglist.h
View file

@ -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

4
src/common/sizer.cpp
View file

@ -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;
}

2
src/msw/darkmode.cpp
View file

@ -52,7 +52,9 @@
#include <memory>
#if wxUSE_LOG_TRACE
static const char* TRACE_DARKMODE = "msw-darkmode";
#endif // wxUSE_LOG_TRACE
#define DWMWA_USE_IMMERSIVE_DARK_MODE 20

2
src/msw/window.cpp
View file

@ -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.

2
src/univ/ctrlrend.cpp
View file

@ -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;