removed Julian's hack that is no longer needed after wxBitmap stubs were added even for DIB-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1104,11 +1104,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
|
|||||||
return wxNullBitmap;
|
return wxNullBitmap;
|
||||||
}
|
}
|
||||||
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
|
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
|
||||||
#if !defined(__WXMSW__) || wxUSE_WXDIB
|
|
||||||
return wxBitmap(img);
|
return wxBitmap(img);
|
||||||
#else
|
|
||||||
return wxBitmap();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user