Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set HBITMAP and its parameters in one call

Browse Source 
To avoid separate calls to SetWidth/Height/Size/Depth functions after calling SetHBITMAP() use newly implemented InitFromHBITMAP() function which allows to set HBITMAP together with its parameters in one call.
This commit is contained in:
Artur Wieczorek
2018-09-11 21:44:56 +02:00
parent 12c44f1c79
commit 97f73acddb
5 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/gdiimage.cpp
View File

@@ -348,26 +348,31 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
int WXUNUSED(desiredHeight))
{
// TODO: load colourmap.
bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.t_str()));
if ( !bitmap->IsOk() )
HBITMAP hbmp = ::LoadBitmap(wxGetInstance(), name.t_str());
if ( hbmp == NULL )
{
// it's probably not found
wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
name.c_str());
name.c_str());
return false;
}
int w, h, d;
BITMAP bm;
if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) )
if (::GetObject(hbmp, sizeof(BITMAP), &bm))
{
w = bm.bmWidth;
h = bm.bmHeight;
d = bm.bmBitsPixel;
}
else
{
wxLogLastError(wxT("GetObject(HBITMAP)"));
w = h = d = 0;
}
bitmap->SetWidth(bm.bmWidth);
bitmap->SetHeight(bm.bmHeight);
bitmap->SetDepth(bm.bmBitsPixel);
bitmap->InitFromHBITMAP((WXHBITMAP)hbmp, w, h, d);
// use 0xc0c0c0 as transparent colour by default
bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));