X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6eb280e9561bc6c392a22cd456b0a0509fa280f4..0c0d1521c0d69e3e45992fd5140d7f663d5970bd:/src/os2/icon.cpp diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index a916c7c979..8b31bf4b08 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -79,7 +79,7 @@ wxIcon::wxIcon( // wxString sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3); - sOs2Name += "Os2.ico"; + sOs2Name += wxT("Os2.ico"); LoadFile( sOs2Name ,lFlags ,nDesiredWidth @@ -135,11 +135,11 @@ void wxIcon::CopyFromBitmap( HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(), - 0, 0, rBmp.GetWidth(), rBmp.GetHeight() + POINTL vPoint[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()}, + {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} }; - POINTL vPointMask[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight() * 2, - 0, 0, rBmp.GetWidth(), rBmp.GetHeight() + POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2}, + {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} }; POINTERINFO vIconInfo;