compilation fix for wxUSE_IMAGE=0 caseinclude/wx/iconbndl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bdf14bff10
commit
b5c4f0dfd9
@ -57,7 +57,7 @@ wxIconBundle::wxIconBundle()
|
||||
{
|
||||
}
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
#if wxUSE_STREAMS && wxUSE_IMAGE
|
||||
wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
|
||||
: wxGDIObject()
|
||||
{
|
||||
@ -69,7 +69,7 @@ wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
|
||||
{
|
||||
AddIcon(stream, type);
|
||||
}
|
||||
#endif // wxUSE_STREAMS
|
||||
#endif // wxUSE_STREAMS && wxUSE_IMAGE
|
||||
|
||||
wxIconBundle::wxIconBundle(const wxIcon& icon)
|
||||
: wxGDIObject()
|
||||
@ -92,7 +92,7 @@ void wxIconBundle::DeleteIcons()
|
||||
UnRef();
|
||||
}
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
#if wxUSE_STREAMS && wxUSE_IMAGE
|
||||
|
||||
namespace
|
||||
{
|
||||
@ -174,7 +174,7 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
|
||||
DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
|
||||
}
|
||||
|
||||
#endif // wxUSE_STREAMS
|
||||
#endif // wxUSE_STREAMS && wxUSE_IMAGE
|
||||
|
||||
wxIcon wxIconBundle::GetIcon(const wxSize& size) const
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user