mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-26 09:56:32 +08:00
Trunk made changes. Code had to change to deal with depth==32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_GTK3@68855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -370,7 +370,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
|
||||
UnRef();
|
||||
|
||||
wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
|
||||
wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
|
||||
wxCHECK_MSG( depth == -1 || depth == 1 || depth == 32, false, wxT("invalid bitmap depth") );
|
||||
|
||||
if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user