Cater for wxUSE_IMAGE=0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-11 10:59:07 +00:00
parent cfb5756157
commit 7da6ab6e2e
2 changed files with 8 additions and 1 deletions

View File

@@ -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

View File

@@ -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