X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..cc1487e53905bd534dba2099d33ac2142cec7818:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 661000a0ae..4a0b326a64 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: iconbndl.cpp +// Name: src/common/iconbndl.cpp // Purpose: wxIconBundle // Author: Mattia Barbon // Created: 23.03.2002 @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "iconbndl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,19 +15,17 @@ #pragma hdrstop #endif +#include "wx/iconbndl.h" + #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/icon.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/bitmap.h" -#endif - -#ifndef _WX_IMAGE_H_ #include "wx/image.h" #endif -#include "wx/iconbndl.h" #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxIconArray) @@ -54,8 +48,13 @@ 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 && (!defined(__WXMSW__) || wxUSE_WXDIB) size_t count = wxImage::GetImageCount( file, type ); size_t i; wxImage image; @@ -74,6 +73,7 @@ void wxIconBundle::AddIcon( const wxString& file, long type ) AddIcon( *tmp ); delete tmp; } +#endif } const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const