Fixed compilation for !wxUSE_IMAGE as well as !wxUSE_TOOLBAR.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-02-16 23:27:54 +00:00
parent 05e4fd64c4
commit 1904aa72f0
7 changed files with 31 additions and 7 deletions

View File

@@ -1528,7 +1528,7 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
return m_smallImageList;
}
#if wxUSE_MIMETYPE
#if wxUSE_MIMETYPE && wxUSE_IMAGE
// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
// one icon and we won't resize it
@@ -1684,6 +1684,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
{
m_smallImageList->Add(bmp);
}
#if wxUSE_IMAGE
else
{
wxImage img = bmp.ConvertToImage();
@@ -1694,7 +1695,8 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
else
m_smallImageList->Add(CreateAntialiasedBitmap(img));
}
#endif // wxUSE_IMAGE
m_HashTable->Put(extension, new wxFileIconEntry(id));
return id;