Compile with wxUSE_DYNLIB_CLASS and wxUSE_WXDIB set to 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-21 16:47:30 +00:00
parent 14d776932c
commit 64c288fa47
22 changed files with 76 additions and 14 deletions

View File

@@ -1483,7 +1483,7 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
return m_smallImageList;
}
#if wxUSE_MIMETYPE && wxUSE_IMAGE
#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
// one icon and we won't resize it
@@ -1643,7 +1643,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
{
m_smallImageList->Add(bmp);
}
#if wxUSE_IMAGE
#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
else
{
wxImage img = bmp.ConvertToImage();