X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 11b113004f..186d4df0cc 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -8,14 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,20 +19,21 @@ #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/stream.h" #endif -#include "wx/arrimpl.cpp" +#include "wx/wfstream.h" +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxIconArray) IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject) -#define M_ICONBUNDLEDATA ((wxIconBundleRefData *)m_refData) +#define M_ICONBUNDLEDATA static_cast(m_refData) // ---------------------------------------------------------------------------- // wxIconBundleRefData @@ -49,14 +42,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject) 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(); } -protected: wxIconArray m_icons; - - friend class wxIconBundle; }; // ============================================================================ @@ -64,21 +64,25 @@ protected: // ============================================================================ 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); } +#endif // wxUSE_FFILE || wxUSE_FILE -wxIconBundle::wxIconBundle(const wxIconBundle& icon) +wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type) : wxGDIObject() { - Ref(icon); + AddIcon(stream, type); } +#endif // wxUSE_STREAMS && wxUSE_IMAGE wxIconBundle::wxIconBundle(const wxIcon& icon) : wxGDIObject() @@ -93,7 +97,7 @@ wxGDIRefData *wxIconBundle::CreateGDIRefData() const wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const { - return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data)); + return new wxIconBundleRefData(*static_cast(data)); } void wxIconBundle::DeleteIcons() @@ -101,14 +105,65 @@ void wxIconBundle::DeleteIcons() UnRef(); } -void wxIconBundle::AddIcon(const wxString& file, long type) +#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): +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); + } +} + +} // 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); - if (tmp.Ok()) + if (tmp.IsOk()) { AddIcon(tmp); return; @@ -116,29 +171,28 @@ void wxIconBundle::AddIcon(const wxString& file, long type) } #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(); @@ -176,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 - if ( sx == sysX && sy == sysY || !iconBest.IsOk() ) + if ((sx == sysX && sy == sysY) || !iconBest.IsOk()) iconBest = icon; } } -#ifdef __WXMAC__ +#if defined( __WXMAC__ ) && wxOSX_USE_CARBON return wxIcon(iconBest.GetHICON(), size); #else return iconBest; @@ -191,7 +245,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const 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; @@ -202,7 +256,7 @@ wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const void wxIconBundle::AddIcon(const wxIcon& icon) { - wxCHECK_RET( icon.IsOk(), _T("invalid icon") ); + wxCHECK_RET( icon.IsOk(), wxT("invalid icon") ); AllocExclusive(); @@ -213,7 +267,7 @@ void wxIconBundle::AddIcon(const wxIcon& icon) 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() ) { @@ -233,8 +287,7 @@ size_t wxIconBundle::GetIconCount() 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]; } -