Merge branch 'bitmap-bundle'

Add wxBitmapBundle and use it in wxToolBar.

See https://github.com/wxWidgets/wxWidgets/pull/2535
This commit is contained in:
Vadim Zeitlin
2021-10-05 18:58:18 +02:00
60 changed files with 2733 additions and 288 deletions

View File

@@ -918,6 +918,8 @@ set(GUI_CMN_SRC
src/generic/creddlgg.cpp
src/generic/rowheightcache.cpp
src/generic/animateg.cpp
src/common/bmpbndl.cpp
src/generic/bmpsvg.cpp
)
set(GUI_CMN_HDR
@@ -1209,6 +1211,7 @@ set(GUI_CMN_HDR
wx/creddlg.h
wx/generic/creddlgg.h
wx/generic/animate.h
wx/bmpbndl.h
)
set(UNIX_SRC
@@ -1961,6 +1964,7 @@ set(MSW_LOWLEVEL_SRC
src/msw/richtooltip.cpp
src/msw/evtloop.cpp
src/msw/ole/access.cpp
src/msw/bmpbndl.cpp
)
set(MSW_LOWLEVEL_HDR
@@ -2298,6 +2302,7 @@ set(OSX_LOWLEVEL_SRC
src/osx/core/timer.cpp
src/osx/core/utilsexc_cf.cpp
#TODO: </if>
src/osx/core/bmpbndl.mm
)
set(OSX_LOWLEVEL_HDR