X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..bcd846ea7191d33d86e28ee1927b461c54d2fb8f:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index 26ea8e74f6..7a26b387a5 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -59,7 +59,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap, mask->p[y] = 0; for (x = 0; x < 8; x++) if ( dc->getPixelFast(x, y) != 0 ) - mask->p[y] |= 1 << (7 - x); + mask->p[y] = (uchar)(mask->p[y] | (1 << (7 - x))); } dc->endPixel(); } @@ -223,7 +223,7 @@ void wxBrush::SetColour(const wxColour& col) M_BRUSHDATA->m_colour = col; } -void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b) +void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { AllocExclusive(); M_BRUSHDATA->m_colour.Set(r, g, b);