X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab71cedf549d1dc433e8be6acd4ff3f9750503f1..fef5c55604e20e2a90843a2278b1f5c8c817dcee:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 54a0b03dc7..0661a1e7db 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -8,7 +8,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "iconbndl.h" #endif @@ -24,9 +24,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 @@ -55,6 +56,7 @@ void wxIconBundle::DeleteIcons() void wxIconBundle::AddIcon( const wxString& file, long type ) { +#if wxUSE_IMAGE size_t count = wxImage::GetImageCount( file, type ); size_t i; wxImage image; @@ -73,6 +75,7 @@ void wxIconBundle::AddIcon( const wxString& file, long type ) AddIcon( *tmp ); delete tmp; } +#endif } const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const