fix compilation without wxUSE_STREAMS (closes #10900)

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 8af8773a59d7f15a25c0cd2ccd12c9b691cc5db4..3bc91fc5962903dd1c532402add123fa5506795e 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -13,8 +13,7 @@
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"

-// for wxSize
-#include "wx/gdicmn.h"
+#include "wx/gdicmn.h"      // for wxSize

 #include "wx/icon.h"
 
 #include "wx/dynarray.h"
 #include "wx/icon.h"
 
 #include "wx/dynarray.h"


@@ -33,10 +32,10 @@ public:
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file

-    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);

 #if wxUSE_STREAMS
 #if wxUSE_STREAMS

+    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);

     wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
     wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);

-#endif
+#endif // wxUSE_STREAMS

 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);


@@ -46,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
     // 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

-    void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);

 #if wxUSE_STREAMS
 #if wxUSE_STREAMS

+    void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);

     void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
     void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);

-#endif
+#endif // wxUSE_STREAMS

 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is
 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 8fa0ccd441d5f665d6832fcb47305d5bf293a71a..26073476f3671841fef0736da59af0241a48156d 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -57,13 +57,13 @@ wxIconBundle::wxIconBundle()
 {
 }
 
 {
 }
 

+#if wxUSE_STREAMS

 wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(file, type);
 }
 
 wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(file, type);
 }
 

-#if wxUSE_STREAMS

 wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
             : wxGDIObject()
 {
 wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
             : wxGDIObject()
 {


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

+#if wxUSE_STREAMS
+

 namespace
 {
 
 namespace
 {
 


@@ -163,11 +165,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     );
 }
 
     );
 }
 

-#if wxUSE_STREAMS

 void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
 {
     DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
 }
 void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
 {
     DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
 }

+

 #endif // wxUSE_STREAMS
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 #endif // wxUSE_STREAMS
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const