Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 825a6431e645c8f3670f452fedbaf5774b5cb90e..186d4df0cccc3ac64838e6d3e70e35e74fdee9ae 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -26,6 +26,8 @@
     #include "wx/stream.h"
 #endif
 
     #include "wx/stream.h"
 #endif
 

+#include "wx/wfstream.h"
+

 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 


@@ -40,7 +42,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
 {
 public:
 class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
 {
 public:

-    // default and copy ctors and assignment operators are ok
+    wxIconBundleRefData() { }
+
+    // We need the copy ctor for CloneGDIRefData() but notice that we use the
+    // base class default ctor in it and not the copy one which it doesn't have.
+    wxIconBundleRefData(const wxIconBundleRefData& other)
+        : wxGDIRefData(),
+          m_icons(other.m_icons)
+    {
+    }
+
+    // default assignment operator and dtor are ok

 
     virtual bool IsOk() const { return !m_icons.empty(); }
 
 
     virtual bool IsOk() const { return !m_icons.empty(); }
 


@@ -55,19 +67,22 @@ wxIconBundle::wxIconBundle()
 {
 }
 
 {
 }
 

+#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

 
 

-#if wxUSE_STREAMS

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

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

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


@@ -90,41 +105,57 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

+#if wxUSE_STREAMS && wxUSE_IMAGE
+

 namespace
 {
 
 // Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure
 // (it must contain "%d", because it is used to report # of image in the file
 // that failed to load):
 namespace
 {
 
 // Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure
 // (it must contain "%d", because it is used to report # of image in the file
 // that failed to load):

-template<typename T>

 void DoAddIcon(wxIconBundle& bundle,
 void DoAddIcon(wxIconBundle& bundle,

-               T& input, wxBitmapType type,
+               wxInputStream& input,
+               wxBitmapType type,

                const wxString& errorMessage)
 {
                const wxString& errorMessage)
 {

-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

     wxImage image;
 
     wxImage image;
 

+    const wxFileOffset posOrig = input.TellI();
+

     const size_t count = wxImage::GetImageCount(input, type);
     for ( size_t i = 0; i < count; ++i )
     {
     const size_t count = wxImage::GetImageCount(input, type);
     for ( size_t i = 0; i < count; ++i )
     {

+        if ( i )
+        {
+            // the call to LoadFile() for the first sub-image updated the
+            // stream position but we need to start reading the subsequent
+            // sub-image at the image beginning too
+            input.SeekI(posOrig);
+        }
+

         if ( !image.LoadFile(input, type, i) )
         {
             wxLogError(errorMessage, i);
             continue;
         }
 
         if ( !image.LoadFile(input, type, i) )
         {
             wxLogError(errorMessage, i);
             continue;
         }
 

+        if ( type == wxBITMAP_TYPE_ANY )
+        {
+            // store the type so that we don't need to try all handlers again
+            // for the subsequent images, they should all be of the same type
+            type = image.GetType();
+        }
+

         wxIcon tmp;
         tmp.CopyFromBitmap(wxBitmap(image));
         bundle.AddIcon(tmp);
     }
         wxIcon tmp;
         tmp.CopyFromBitmap(wxBitmap(image));
         bundle.AddIcon(tmp);
     }

-#else // !wxUSE_IMAGE
-    wxUnusedVar(input);
-    wxUnusedVar(type);
-#endif // wxUSE_IMAGE/!wxUSE_IMAGE

 }
 
 } // 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__


@@ -132,7 +163,7 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         wxIcon tmp(file, type);
     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         wxIcon tmp(file, type);

-        if (tmp.Ok())
+        if (tmp.IsOk())

         {
             AddIcon(tmp);
             return;
         {
             AddIcon(tmp);
             return;


@@ -140,20 +171,27 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     }
 #endif // __WXMAC__
 
     }
 #endif // __WXMAC__
 

+#if wxUSE_FFILE
+    wxFFileInputStream stream(file);
+#elif wxUSE_FILE
+    wxFileInputStream stream(file);
+#endif

     DoAddIcon
     (
         *this,
     DoAddIcon
     (
         *this,

-        file, type,
+        stream, type,

         wxString::Format(_("Failed to load image %%d from file '%s'."), file)
     );
 }
 
         wxString::Format(_("Failed to load image %%d from file '%s'."), file)
     );
 }
 

-#if wxUSE_STREAMS
+#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."));
 }

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

 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {


@@ -207,7 +245,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
 {
     wxIcon icon = GetIcon(size);
 wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
 {
     wxIcon icon = GetIcon(size);

-    if ( icon.Ok() &&
+    if ( icon.IsOk() &&

             (icon.GetWidth() != size.x || icon.GetHeight() != size.y) )
     {
         icon = wxNullIcon;
             (icon.GetWidth() != size.x || icon.GetHeight() != size.y) )
     {
         icon = wxNullIcon;


@@ -218,7 +256,7 @@ wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
 
 void wxIconBundle::AddIcon(const wxIcon& icon)
 {
 
 void wxIconBundle::AddIcon(const wxIcon& icon)
 {

-    wxCHECK_RET( icon.IsOk(), _T("invalid icon") );
+    wxCHECK_RET( icon.IsOk(), wxT("invalid icon") );

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -229,7 +267,7 @@ void wxIconBundle::AddIcon(const wxIcon& icon)
     for ( size_t i = 0; i < count; ++i )
     {
         wxIcon& tmp = iconArray[i];
     for ( size_t i = 0; i < count; ++i )
     {
         wxIcon& tmp = iconArray[i];

-        if ( tmp.Ok() &&
+        if ( tmp.IsOk() &&

                 tmp.GetWidth() == icon.GetWidth() &&
                 tmp.GetHeight() == icon.GetHeight() )
         {
                 tmp.GetWidth() == icon.GetWidth() &&
                 tmp.GetHeight() == icon.GetHeight() )
         {


@@ -249,7 +287,7 @@ size_t wxIconBundle::GetIconCount() const
 
 wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 {
 
 wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 {

-    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, _T("invalid index") );
+    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, wxT("invalid index") );

 
     return M_ICONBUNDLEDATA->m_icons[n];
 }
 
     return M_ICONBUNDLEDATA->m_icons[n];
 }