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
commit
af1069374e
60 changed files with 2733 additions and 288 deletions
|
|
@ -2261,6 +2261,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_uuid.obj \
|
||||
$(OBJS)\monodll_evtloop.obj \
|
||||
$(OBJS)\monodll_access.obj \
|
||||
$(OBJS)\monodll_msw_bmpbndl.obj \
|
||||
$(OBJS)\monodll_clrpickerg.obj \
|
||||
$(OBJS)\monodll_collpaneg.obj \
|
||||
$(OBJS)\monodll_filepickerg.obj \
|
||||
|
|
@ -2533,7 +2534,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_laywin.obj \
|
||||
$(OBJS)\monodll_calctrlg.obj \
|
||||
$(OBJS)\monodll_creddlgg.obj \
|
||||
$(OBJS)\monodll_rowheightcache.obj
|
||||
$(OBJS)\monodll_rowheightcache.obj \
|
||||
$(OBJS)\monodll_common_bmpbndl.obj \
|
||||
$(OBJS)\monodll_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
|
|
@ -2604,6 +2607,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_uuid.obj \
|
||||
$(OBJS)\monodll_evtloop.obj \
|
||||
$(OBJS)\monodll_access.obj \
|
||||
$(OBJS)\monodll_msw_bmpbndl.obj \
|
||||
$(OBJS)\monodll_generic_accel.obj \
|
||||
$(OBJS)\monodll_clrpickerg.obj \
|
||||
$(OBJS)\monodll_collpaneg.obj \
|
||||
|
|
@ -2861,7 +2865,9 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
|||
$(OBJS)\monodll_laywin.obj \
|
||||
$(OBJS)\monodll_calctrlg.obj \
|
||||
$(OBJS)\monodll_creddlgg.obj \
|
||||
$(OBJS)\monodll_rowheightcache.obj
|
||||
$(OBJS)\monodll_rowheightcache.obj \
|
||||
$(OBJS)\monodll_common_bmpbndl.obj \
|
||||
$(OBJS)\monodll_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_STC)" == "1"
|
||||
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
|
||||
|
|
@ -3104,6 +3110,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_uuid.obj \
|
||||
$(OBJS)\monolib_evtloop.obj \
|
||||
$(OBJS)\monolib_access.obj \
|
||||
$(OBJS)\monolib_msw_bmpbndl.obj \
|
||||
$(OBJS)\monolib_clrpickerg.obj \
|
||||
$(OBJS)\monolib_collpaneg.obj \
|
||||
$(OBJS)\monolib_filepickerg.obj \
|
||||
|
|
@ -3376,7 +3383,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_laywin.obj \
|
||||
$(OBJS)\monolib_calctrlg.obj \
|
||||
$(OBJS)\monolib_creddlgg.obj \
|
||||
$(OBJS)\monolib_rowheightcache.obj
|
||||
$(OBJS)\monolib_rowheightcache.obj \
|
||||
$(OBJS)\monolib_common_bmpbndl.obj \
|
||||
$(OBJS)\monolib_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
|
|
@ -3447,6 +3456,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_uuid.obj \
|
||||
$(OBJS)\monolib_evtloop.obj \
|
||||
$(OBJS)\monolib_access.obj \
|
||||
$(OBJS)\monolib_msw_bmpbndl.obj \
|
||||
$(OBJS)\monolib_generic_accel.obj \
|
||||
$(OBJS)\monolib_clrpickerg.obj \
|
||||
$(OBJS)\monolib_collpaneg.obj \
|
||||
|
|
@ -3704,7 +3714,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
|||
$(OBJS)\monolib_laywin.obj \
|
||||
$(OBJS)\monolib_calctrlg.obj \
|
||||
$(OBJS)\monolib_creddlgg.obj \
|
||||
$(OBJS)\monolib_rowheightcache.obj
|
||||
$(OBJS)\monolib_rowheightcache.obj \
|
||||
$(OBJS)\monolib_common_bmpbndl.obj \
|
||||
$(OBJS)\monolib_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_STC)" == "1"
|
||||
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
|
||||
|
|
@ -3880,6 +3892,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_uuid.obj \
|
||||
$(OBJS)\coredll_evtloop.obj \
|
||||
$(OBJS)\coredll_access.obj \
|
||||
$(OBJS)\coredll_msw_bmpbndl.obj \
|
||||
$(OBJS)\coredll_clrpickerg.obj \
|
||||
$(OBJS)\coredll_collpaneg.obj \
|
||||
$(OBJS)\coredll_filepickerg.obj \
|
||||
|
|
@ -4152,7 +4165,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_laywin.obj \
|
||||
$(OBJS)\coredll_calctrlg.obj \
|
||||
$(OBJS)\coredll_creddlgg.obj \
|
||||
$(OBJS)\coredll_rowheightcache.obj
|
||||
$(OBJS)\coredll_rowheightcache.obj \
|
||||
$(OBJS)\coredll_common_bmpbndl.obj \
|
||||
$(OBJS)\coredll_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
|
|
@ -4223,6 +4238,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_uuid.obj \
|
||||
$(OBJS)\coredll_evtloop.obj \
|
||||
$(OBJS)\coredll_access.obj \
|
||||
$(OBJS)\coredll_msw_bmpbndl.obj \
|
||||
$(OBJS)\coredll_generic_accel.obj \
|
||||
$(OBJS)\coredll_clrpickerg.obj \
|
||||
$(OBJS)\coredll_collpaneg.obj \
|
||||
|
|
@ -4480,7 +4496,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
|||
$(OBJS)\coredll_laywin.obj \
|
||||
$(OBJS)\coredll_calctrlg.obj \
|
||||
$(OBJS)\coredll_creddlgg.obj \
|
||||
$(OBJS)\coredll_rowheightcache.obj
|
||||
$(OBJS)\coredll_rowheightcache.obj \
|
||||
$(OBJS)\coredll_common_bmpbndl.obj \
|
||||
$(OBJS)\coredll_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
|
||||
__corelib___depname = \
|
||||
|
|
@ -4561,6 +4579,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_uuid.obj \
|
||||
$(OBJS)\corelib_evtloop.obj \
|
||||
$(OBJS)\corelib_access.obj \
|
||||
$(OBJS)\corelib_msw_bmpbndl.obj \
|
||||
$(OBJS)\corelib_clrpickerg.obj \
|
||||
$(OBJS)\corelib_collpaneg.obj \
|
||||
$(OBJS)\corelib_filepickerg.obj \
|
||||
|
|
@ -4833,7 +4852,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_laywin.obj \
|
||||
$(OBJS)\corelib_calctrlg.obj \
|
||||
$(OBJS)\corelib_creddlgg.obj \
|
||||
$(OBJS)\corelib_rowheightcache.obj
|
||||
$(OBJS)\corelib_rowheightcache.obj \
|
||||
$(OBJS)\corelib_common_bmpbndl.obj \
|
||||
$(OBJS)\corelib_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
|
||||
____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
|
|
@ -4904,6 +4925,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_uuid.obj \
|
||||
$(OBJS)\corelib_evtloop.obj \
|
||||
$(OBJS)\corelib_access.obj \
|
||||
$(OBJS)\corelib_msw_bmpbndl.obj \
|
||||
$(OBJS)\corelib_generic_accel.obj \
|
||||
$(OBJS)\corelib_clrpickerg.obj \
|
||||
$(OBJS)\corelib_collpaneg.obj \
|
||||
|
|
@ -5161,7 +5183,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
|||
$(OBJS)\corelib_laywin.obj \
|
||||
$(OBJS)\corelib_calctrlg.obj \
|
||||
$(OBJS)\corelib_creddlgg.obj \
|
||||
$(OBJS)\corelib_rowheightcache.obj
|
||||
$(OBJS)\corelib_rowheightcache.obj \
|
||||
$(OBJS)\corelib_common_bmpbndl.obj \
|
||||
$(OBJS)\corelib_bmpsvg.obj
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
____wxcore_namedll_DEP = $(__coredll___depname)
|
||||
|
|
@ -8849,6 +8873,11 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbndl.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
|
||||
|
|
@ -9894,6 +9923,16 @@ $(OBJS)\monodll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_common_bmpbndl.obj: ..\..\src\common\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbndl.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_bmpsvg.obj: ..\..\src\generic\bmpsvg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpsvg.cpp
|
||||
!endif
|
||||
|
||||
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
|
||||
rc /fo$@ /d WIN32 /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\3rdparty\pcre\src\wx /i ..\..\src\expat\expat\lib $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) $(__TARGET_CPU_COMPFLAG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_66) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d NO_CXX11_REGEX /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc
|
||||
|
||||
|
|
@ -11426,6 +11465,11 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbndl.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
|
||||
|
|
@ -12471,6 +12515,16 @@ $(OBJS)\monolib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_common_bmpbndl.obj: ..\..\src\common\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbndl.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_bmpsvg.obj: ..\..\src\generic\bmpsvg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpsvg.cpp
|
||||
!endif
|
||||
|
||||
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
|
||||
|
||||
|
|
@ -13973,6 +14027,11 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbndl.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
|
||||
|
|
@ -15018,6 +15077,16 @@ $(OBJS)\coredll_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_common_bmpbndl.obj: ..\..\src\common\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbndl.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_bmpsvg.obj: ..\..\src\generic\bmpsvg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\bmpsvg.cpp
|
||||
!endif
|
||||
|
||||
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
|
||||
|
||||
|
|
@ -15713,6 +15782,11 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbndl.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
|
||||
|
|
@ -16758,6 +16832,16 @@ $(OBJS)\corelib_rowheightcache.obj: ..\..\src\generic\rowheightcache.cpp
|
|||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\rowheightcache.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_common_bmpbndl.obj: ..\..\src\common\bmpbndl.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbndl.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_bmpsvg.obj: ..\..\src\generic\bmpsvg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\bmpsvg.cpp
|
||||
!endif
|
||||
|
||||
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue