]> git.saurik.com Git - wxWidgets.git/commit
Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 13 Sep 2012 17:15:25 +0000 (17:15 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 13 Sep 2012 17:15:25 +0000 (17:15 +0000)
commitc3f641cb5e2a89f9e191ee5b60eb6dafb23096d3
tree3fced5df5e698d46c8621dac04cddd90e4200b43
parent20e6714a67e1188b9bbb8ca2bc0fb6321e2864fc
Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images.

Just as wxBITMAP() provides a portable way of loading bitmaps from either
Windows BMP resources or embedded XPM data depending on the platform,
wxBITMAP_PNG() hides the difference between loading bitmaps from PNG resources
under Windows and embedded PNG data elsewhere.

Also add wxBITMAP_PNG_FROM_DATA() macro which always loads PNG data from
memory: it's needed anyhow as part of wxBITMAP_PNG() implementation and some
people may prefer to always use it under all platforms.

Finally modify the image sample to demonstrate loading PNG images from both
resources and memory. This involved creation of a new Windows .rc file for it
and copying its data files to Resources bundle directory under OS X.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
20 files changed:
docs/changes.txt
docs/doxygen/overviews/bitmap.h
include/wx/bitmap.h
include/wx/gdicmn.h
interface/wx/gdicmn.h
samples/image/Makefile.in
samples/image/canvas.cpp
samples/image/canvas.h
samples/image/cursor_png.c [new file with mode: 0644]
samples/image/image.bkl
samples/image/image.dsp
samples/image/image.rc [new file with mode: 0644]
samples/image/image_vc7.vcproj
samples/image/image_vc8.vcproj
samples/image/image_vc9.vcproj
samples/image/makefile.bcc
samples/image/makefile.gcc
samples/image/makefile.vc
samples/image/makefile.wat
src/msw/gdiimage.cpp