From 7da6ab6e2e1c5f468e29e14eac8e0cf6ca033207 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 11 Aug 2003 10:59:07 +0000 Subject: [PATCH] Cater for wxUSE_IMAGE=0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/iconbndl.cpp | 4 +++- src/common/quantize.cpp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 661000a0ae..0661a1e7db 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -27,7 +27,7 @@ #include "wx/bitmap.h" #endif -#ifndef _WX_IMAGE_H_ +#if wxUSE_IMAGE && !defined(_WX_IMAGE_H_) #include "wx/image.h" #endif @@ -56,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; @@ -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 diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index b792d14833..736619734c 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -45,6 +45,8 @@ #include "wx/palette.h" #endif +#if wxUSE_IMAGE + #include "wx/image.h" #include "wx/quantize.h" @@ -1655,3 +1657,6 @@ bool wxQuantize::Quantize(const wxImage& src, return TRUE; } +#endif + // wxUSE_IMAGE + -- 2.45.2