honor wxMAXIMIZE frame style, fixes #11631

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 5d509c0158a9c918d957b19a972e34a8405ccbbc..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()
 {
@@ -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
 {
@@ -156,7 +156,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     }
 #endif // __WXMAC__
 
+#if wxUSE_FFILE
     wxFFileInputStream stream(file);
+#elif wxUSE_FILE
+    wxFileInputStream stream(file);
+#endif
     DoAddIcon
     (
         *this,
@@ -170,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
 {