From 2d1c63a4c16a5494c1018d7aeeb8b78e9151fe44 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 22 Apr 2023 17:32:03 +0200 Subject: [PATCH] Install all required headers as part of wxUniv/MSW installation Move headers needed by wxUniv too to MSW_LOWLEVEL_HDR, so that they get installed by "make install". --- Makefile.in | 79 ++++++++++++++++++++------------------- build/bakefiles/files.bkl | 77 +++++++++++++++++++------------------- build/cmake/files.cmake | 77 +++++++++++++++++++------------------- build/files | 77 +++++++++++++++++++------------------- 4 files changed, 157 insertions(+), 153 deletions(-) diff --git a/Makefile.in b/Makefile.in index 09fccd91fb..f39b67f76d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2875,7 +2875,46 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR = \ wx/msw/sound.h \ wx/msw/joystick.h \ wx/msw/evtloop.h \ - wx/msw/taskbarbutton.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 = @@ -3115,41 +3154,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 \ @@ -3159,30 +3179,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 \ @@ -3198,10 +3203,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ 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 +3213,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 \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 05eb446931..f8546957e4 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1781,6 +1781,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! 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 @@ -1857,41 +1896,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 @@ -1901,30 +1921,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 @@ -1940,10 +1945,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! 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 +1955,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 diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index ebacb69079..4f0228c961 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -1658,6 +1658,45 @@ set(MSW_LOWLEVEL_HDR 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 @@ -1747,41 +1786,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 @@ -1791,30 +1811,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 @@ -1831,10 +1836,7 @@ set(MSW_HDR 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 +1845,6 @@ set(MSW_HDR wx/msw/datetimectrl.h wx/msw/timectrl.h wx/generic/activityindicator.h - wx/msw/darkmode.h ) set(MSW_RSC diff --git a/build/files b/build/files index 5c7d2ce2a4..f8e3f85851 100644 --- a/build/files +++ b/build/files @@ -1652,18 +1652,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 @@ -1740,48 +1779,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 @@ -1791,31 +1810,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 @@ -1832,10 +1836,7 @@ MSW_HDR = 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: