Fix compilation of wxIconBundle in some particular minimal builds.

Let the code compile when wxUSE_STREAMS==1 but wxUSE_FILE and wxUSE_FFILE are
both 0.

Closes #10900.

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index a1082d710b2a3cf1c567895bf9a5a2e1e2bcea06..e80edb4d9ff31c4e9a68a0107b210fc958b71b57 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -33,7 +33,9 @@ public:
 
     // initializes the bundle with the icon(s) found in the file
 #if wxUSE_STREAMS && wxUSE_IMAGE
 
     // initializes the bundle with the icon(s) found in the file
 #if wxUSE_STREAMS && wxUSE_IMAGE

+#if wxUSE_FFILE || wxUSE_FILE

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

+#endif // wxUSE_FFILE || wxUSE_FILE

     wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
 #endif // wxUSE_STREAMS && wxUSE_IMAGE
 
     wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
 #endif // wxUSE_STREAMS && wxUSE_IMAGE
 


@@ -46,7 +48,9 @@ public:
     // if the collection already contains icons with the same
     // width and height, they are replaced
 #if wxUSE_STREAMS && wxUSE_IMAGE
     // if the collection already contains icons with the same
     // width and height, they are replaced
 #if wxUSE_STREAMS && wxUSE_IMAGE

+#if wxUSE_FFILE || wxUSE_FILE

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

+#endif // wxUSE_FFILE || wxUSE_FILE

     void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
 #endif // wxUSE_STREAMS && wxUSE_IMAGE
 
     void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
 #endif // wxUSE_STREAMS && wxUSE_IMAGE
 


@@ -83,6 +87,7 @@ public:
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 #if WXWIN_COMPATIBILITY_2_8
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 #if WXWIN_COMPATIBILITY_2_8

+#if wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)

     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);


@@ -94,6 +99,7 @@ public:
             AddIcon(file, (wxBitmapType)type);
         }
     )
             AddIcon(file, (wxBitmapType)type);
         }
     )

+#endif // wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)

 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 protected:

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 8c97c318c9c7304ba1b23612f4174f50dffa005c..e87312bc5e4f77d524185f466e847c2d7fdb5699 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -58,11 +58,14 @@ wxIconBundle::wxIconBundle()
 }
 
 #if wxUSE_STREAMS && wxUSE_IMAGE
 }
 
 #if wxUSE_STREAMS && wxUSE_IMAGE

+
+#if wxUSE_FFILE || wxUSE_FILE

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

+#endif // wxUSE_FFILE || wxUSE_FILE

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


@@ -141,6 +144,8 @@ void DoAddIcon(wxIconBundle& bundle,
 
 } // anonymous namespace
 
 
 } // anonymous namespace
 

+#if wxUSE_FFILE || wxUSE_FILE
+

 void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__
 void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__


@@ -169,6 +174,8 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     );
 }
 
     );
 }
 

+#endif // wxUSE_FFILE || wxUSE_FILE
+

 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."));