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
2006-01-21 16:47:30 +00:00
parent 14d776932c
commit 64c288fa47
22 changed files with 76 additions and 14 deletions
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -223,7 +223,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 {
    wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
    if (bmp.Ok())
    {
        // fit into transparent image with desired size hint from the client