From b5c4f0dfd9c9f84c7fbba8d5da2b70c6a1d7c902 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 15 Dec 2009 11:24:50 +0000 Subject: [PATCH] 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 --- src/common/iconbndl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 4958538025..8c97c318c9 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -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 { -- 2.50.0