From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 15 Dec 2009 11:25:11 +0000 (+0000)
Subject: compilation fix for wxUSE_IMAGE=0 case
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e94be2b1325b7f96c6feab64f303d482bb979e29?ds=inline

compilation fix for wxUSE_IMAGE=0 case

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 3bc91fc596..a1082d710b 100644
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -32,10 +32,10 @@ public:
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_IMAGE
     wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
     wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_IMAGE
 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
@@ -45,10 +45,10 @@ public:
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_IMAGE
     void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
     void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_IMAGE
 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is