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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 49585380250d5d3826b6917cdc8f4029f1a88aa3..8c97c318c9c7304ba1b23612f4174f50dffa005c 100644 (file)
--- 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()
 {
 wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {


@@ -69,7 +69,7 @@ wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
 {
     AddIcon(stream, type);
 }
 {
     AddIcon(stream, type);
 }

-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_IMAGE

 
 wxIconBundle::wxIconBundle(const wxIcon& icon)
             : wxGDIObject()
 
 wxIconBundle::wxIconBundle(const wxIcon& icon)
             : wxGDIObject()


@@ -92,7 +92,7 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_IMAGE

 
 namespace
 {
 
 namespace
 {


@@ -174,7 +174,7 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
     DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
 }
 
     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
 {
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {