X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5309f580333db2f4c3682ffecc7e389a19bd32f..42d0df0030abbac4ca11a78b2f529133e3c9d986:/src/common/iconbndl.cpp?ds=inline diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 479c5dd27c..aeeb09fef8 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "iconbndl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -24,9 +20,10 @@ #include "wx/icon.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/bitmap.h" #endif -#ifndef _WX_IMAGE_H_ +#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_) #include "wx/image.h" #endif @@ -53,12 +50,16 @@ void wxIconBundle::DeleteIcons() m_icons.Empty(); } +#if wxUSE_IMAGE void wxIconBundle::AddIcon( const wxString& file, long type ) +#else +void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) ) +#endif { +#if wxUSE_IMAGE size_t count = wxImage::GetImageCount( file, type ); size_t i; wxImage image; - wxIcon tmp; for( i = 0; i < count; ++i ) { @@ -69,9 +70,12 @@ void wxIconBundle::AddIcon( const wxString& file, long type ) continue; } - tmp.CopyFromBitmap( wxBitmap( image ) ); - AddIcon( tmp ); + wxIcon* tmp = new wxIcon(); + tmp->CopyFromBitmap( wxBitmap( image ) ); + AddIcon( *tmp ); + delete tmp; } +#endif } const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const @@ -79,14 +83,23 @@ const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const size_t i, max = m_icons.GetCount(); wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ), sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y ); - wxIcon* sysIcon = 0; - for( i = 0; i < max; ++i ) + wxIcon *sysIcon = 0; + // temp. variable needed to fix Borland C++ 5.5.1 problem + // with passing a return value through two functions + wxIcon *tmp; + + for( i = 0; i < max; i++ ) { + if( !m_icons[i].Ok() ) + continue; wxCoord sx = m_icons[i].GetWidth(), sy = m_icons[i].GetHeight(); // requested size if( sx == size.x && sy == size.y ) - return m_icons[i]; + { + tmp = &m_icons[i]; // fix for broken BCC + return *tmp; + } // keep track if there is a system-size icon if( sx == sysX && sy == sysY ) sysIcon = &m_icons[i]; @@ -95,7 +108,11 @@ const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const // return the system-sized icon if we've got one if( sysIcon ) return *sysIcon; // return the first icon, if we have one - return max > 0 ? m_icons[0] : wxNullIcon; + if( max > 0 ) // fix for broken BCC + tmp = &m_icons[0]; + else + tmp = &wxNullIcon; + return *tmp; } void wxIconBundle::AddIcon( const wxIcon& icon ) @@ -105,7 +122,7 @@ void wxIconBundle::AddIcon( const wxIcon& icon ) for( i = 0; i < max; ++i ) { wxIcon& tmp = m_icons[i]; - if( tmp.GetWidth() == icon.GetWidth() && + if( tmp.Ok() && tmp.GetWidth() == icon.GetWidth() && tmp.GetHeight() == icon.GetHeight() ) { tmp = icon;