X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9853e3b7d4e2f949d4ce310f95d5f70e0ce73900..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/msw/xpmhand.cpp?ds=sidebyside diff --git a/src/msw/xpmhand.cpp b/src/msw/xpmhand.cpp index 064e9fc34a..78459be100 100644 --- a/src/msw/xpmhand.cpp +++ b/src/msw/xpmhand.cpp @@ -55,7 +55,7 @@ static void XpmToBitmap(wxBitmap *bitmap, BITMAP bm; if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(bm), (LPSTR) & bm) ) { - wxLogLastError("GetObject(bitmap)"); + wxLogLastError(wxT("GetObject(bitmap)")); } refData->m_width = bm.bmWidth; @@ -67,7 +67,8 @@ static void XpmToBitmap(wxBitmap *bitmap, if (xmask) { wxMask *mask = new wxMask(); - mask->SetMaskBitmap((WXHBITMAP) wxInvertMask(xmask->bitmap)); + mask->SetMaskBitmap((WXHBITMAP) wxInvertMask(xmask->bitmap, + bm.bmWidth, bm.bmHeight)); bitmap->SetMask(mask); } }