X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..ff7d9066dae29da2bcfe611b62bcb276ce2afff0:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index 8120943325..039d7ef4f5 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(); } @@ -143,18 +143,6 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap) M_BRUSHDATA->m_style = wxSTIPPLE; } -wxBrush::wxBrush(const wxBrush &brush) -{ - Ref(brush); -} - -wxBrush& wxBrush::operator = (const wxBrush& brush) -{ - if (*this == brush) return (*this); - Ref(brush); - return *this; -} - bool wxBrush::operator == (const wxBrush& brush) const { return m_refData == brush.m_refData;