X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..39987096b3aa3e1bec4f69a5793780f7ea2dd914:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 661000a0ae..40ff56d9ed 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -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" @@ -27,7 +23,7 @@ #include "wx/bitmap.h" #endif -#ifndef _WX_IMAGE_H_ +#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_) #include "wx/image.h" #endif @@ -54,8 +50,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 +75,7 @@ void wxIconBundle::AddIcon( const wxString& file, long type ) AddIcon( *tmp ); delete tmp; } +#endif } const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const