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 961eb7f4a32e3f82735d5d95ad1590b62a12b9de..186d4df0cccc3ac64838e6d3e70e35e74fdee9ae 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -8,14 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -27,20 +19,21 @@
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"

-    #include "wx/icon.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/image.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/image.h"

+    #include "wx/stream.h"

 #endif
 
 #endif
 

-#include "wx/arrimpl.cpp"
+#include "wx/wfstream.h"

 
 

+#include "wx/arrimpl.cpp"

 WX_DEFINE_OBJARRAY(wxIconArray)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 

-#define M_ICONBUNDLEDATA ((wxIconBundleRefData *)m_refData)
+#define M_ICONBUNDLEDATA static_cast<wxIconBundleRefData*>(m_refData)

 
 // ----------------------------------------------------------------------------
 // wxIconBundleRefData
 
 // ----------------------------------------------------------------------------
 // wxIconBundleRefData


@@ -49,12 +42,21 @@ 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() { }

 
 

-protected:
-    wxIconArray m_icons;
+    // 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)
+    {
+    }

 
 

-    friend class WXDLLEXPORT wxIconBundle;
+    // default assignment operator and dtor are ok
+
+    virtual bool IsOk() const { return !m_icons.empty(); }
+
+    wxIconArray m_icons;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -62,21 +64,25 @@ protected:
 // ============================================================================
 
 wxIconBundle::wxIconBundle()
 // ============================================================================
 
 wxIconBundle::wxIconBundle()

-            : wxGDIObject()

 {
 }
 
 {
 }
 

-wxIconBundle::wxIconBundle(const wxString& file, long type)
+#if wxUSE_STREAMS && wxUSE_IMAGE
+
+#if wxUSE_FFILE || wxUSE_FILE
+wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)

             : wxGDIObject()
 {
     AddIcon(file, type);
 }
             : wxGDIObject()
 {
     AddIcon(file, type);
 }

+#endif // wxUSE_FFILE || wxUSE_FILE

 
 

-wxIconBundle::wxIconBundle(const wxIconBundle& icon)
+wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)

             : wxGDIObject()
 {
             : wxGDIObject()
 {

-    Ref(icon);
+    AddIcon(stream, type);

 }
 }

+#endif // wxUSE_STREAMS && wxUSE_IMAGE

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


@@ -84,14 +90,14 @@ wxIconBundle::wxIconBundle(const wxIcon& icon)
     AddIcon(icon);
 }
 
     AddIcon(icon);
 }
 

-wxObjectRefData *wxIconBundle::CreateRefData() const
+wxGDIRefData *wxIconBundle::CreateGDIRefData() const

 {
     return new wxIconBundleRefData;
 }
 
 {
     return new wxIconBundleRefData;
 }
 

-wxObjectRefData *wxIconBundle::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data));
+    return new wxIconBundleRefData(*static_cast<const wxIconBundleRefData *>(data));

 }
 
 void wxIconBundle::DeleteIcons()
 }
 
 void wxIconBundle::DeleteIcons()


@@ -99,19 +105,65 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

-bool wxIconBundle::IsOk() const
+#if wxUSE_STREAMS && wxUSE_IMAGE
+
+namespace

 {
 {

-    return M_ICONBUNDLEDATA && !M_ICONBUNDLEDATA->m_icons.IsEmpty();
+
+// 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):
+void DoAddIcon(wxIconBundle& bundle,
+               wxInputStream& input,
+               wxBitmapType type,
+               const wxString& errorMessage)
+{
+    wxImage image;
+
+    const wxFileOffset posOrig = input.TellI();
+
+    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 ( 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);
+    }

 }
 
 }
 

-void wxIconBundle::AddIcon(const wxString& file, long type)
+} // anonymous namespace
+
+#if wxUSE_FFILE || wxUSE_FILE
+
+void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)

 {
 #ifdef __WXMAC__
     // Deal with standard icons
     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         wxIcon tmp(file, type);
 {
 #ifdef __WXMAC__
     // Deal with standard icons
     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         wxIcon tmp(file, type);

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

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


@@ -119,29 +171,28 @@ void wxIconBundle::AddIcon(const wxString& file, long type)
     }
 #endif // __WXMAC__
 
     }
 #endif // __WXMAC__
 

-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
-    wxImage image;
+#if wxUSE_FFILE
+    wxFFileInputStream stream(file);
+#elif wxUSE_FILE
+    wxFileInputStream stream(file);
+#endif
+    DoAddIcon
+    (
+        *this,
+        stream, type,
+        wxString::Format(_("Failed to load image %%d from file '%s'."), file)
+    );
+}

 
 

-    const size_t count = wxImage::GetImageCount( file, type );
-    for ( size_t i = 0; i < count; ++i )
-    {
-        if ( !image.LoadFile( file, type, i ) )
-        {
-            wxLogError( _("Failed to load image %d from file '%s'."),
-                        i, file.c_str() );
-            continue;
-        }
+#endif // wxUSE_FFILE || wxUSE_FILE

 
 

-        wxIcon tmp;
-        tmp.CopyFromBitmap(wxBitmap(image));
-        AddIcon(tmp);
-    }
-#else // !wxUSE_IMAGE
-    wxUnusedVar(file);
-    wxUnusedVar(type);
-#endif // wxUSE_IMAGE/!wxUSE_IMAGE
+void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
+{
+    DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));

 }
 
 }
 

+#endif // wxUSE_STREAMS && wxUSE_IMAGE
+

 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {
     const size_t count = GetIconCount();
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {
     const size_t count = GetIconCount();


@@ -179,12 +230,12 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 
                 // the best icon is by default (arbitrarily) the first one but
                 // if we find a system-sized icon, take it instead
 
                 // the best icon is by default (arbitrarily) the first one but
                 // if we find a system-sized icon, take it instead

-                if ( sx == sysX && sy == sysY || !iconBest.IsOk() )
+                if ((sx == sysX && sy == sysY) || !iconBest.IsOk())

                     iconBest = icon;
             }
     }
 
                     iconBest = icon;
             }
     }
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;


@@ -194,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;


@@ -205,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();
 


@@ -216,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() )
         {


@@ -236,8 +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];
 }

-