X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c41c20a566cb7558661a68c0ed6712a84982093f..4fdfe2f3ae110c1f1ba2d925749cac5b761eff4b:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index 437a499948..b151db8a0a 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -1,16 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.cpp +// Name: src/mgl/brush.cpp // Purpose: // Author: Vaclav Slavik // Id: $Id$ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "brush.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,7 +16,7 @@ #include "wx/brush.h" #include "wx/mgl/private.h" -#include "wx/mgl/dcmemory.h" +#include "wx/dcmemory.h" // --------------------------------------------------------------------------- @@ -30,31 +26,31 @@ // This function converts wxBitmap into pixpattern24_t representation // (used by wxBrush and wxPen) -void wxBitmapToPixPattern(const wxBitmap& bitmap, +void wxBitmapToPixPattern(const wxBitmap& bitmap, pixpattern24_t *pix, pattern_t *mask) { wxMemoryDC mem; MGLDevCtx *dc; int x, y; - + if ( pix != NULL ) { - mem.SelectObject(bitmap); + mem.SelectObjectAsSource(bitmap); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel(); for (y = 0; y < 8; y++) for (x = 0; x < 8; x++) - dc->unpackColorFast(dc->getPixelFast(x, y), + dc->unpackColorFast(dc->getPixelFast(x, y), pix->p[y][x][2], - pix->p[y][x][1], + pix->p[y][x][1], pix->p[y][x][0]); dc->endPixel(); } if ( mask && bitmap.GetMask() ) { - mem.SelectObject(*bitmap.GetMask()->GetBitmap()); + mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap()); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel(); @@ -63,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(); } @@ -80,6 +76,13 @@ public: wxBrushRefData(); wxBrushRefData(const wxBrushRefData& data); + bool operator == (const wxBrushRefData& data) const + { + return (m_style == data.m_style && + m_stipple.IsSameAs(data.m_stipple) && + m_colour == data.m_colour); + } + int m_style; wxColour m_colour; wxBitmap m_stipple; @@ -131,37 +134,29 @@ wxBrush::wxBrush(const wxColour &colour, int style) wxBrush::wxBrush(const wxBitmap &stippleBitmap) { wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") ); - wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8, + wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8, _T("stipple bitmap must be 8x8") ); m_refData = new wxBrushRefData(); M_BRUSHDATA->m_colour = *wxBLACK; - + M_BRUSHDATA->m_stipple = stippleBitmap; - wxBitmapToPixPattern(stippleBitmap, &(M_BRUSHDATA->m_pixPattern), + wxBitmapToPixPattern(stippleBitmap, &(M_BRUSHDATA->m_pixPattern), &(M_BRUSHDATA->m_maskPattern)); if (M_BRUSHDATA->m_stipple.GetMask()) - M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; - else - M_BRUSHDATA->m_style = wxSTIPPLE; + M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; + else + M_BRUSHDATA->m_style = wxSTIPPLE; } -wxBrush::wxBrush(const wxBrush &brush) +bool wxBrush::operator == (const wxBrush& brush) const { - Ref(brush); -} + if (m_refData == brush.m_refData) return true; -wxBrush& wxBrush::operator = (const wxBrush& brush) -{ - if (*this == brush) return (*this); - Ref(brush); - return *this; -} + if (!m_refData || !brush.m_refData) return false; -bool wxBrush::operator == (const wxBrush& brush) const -{ - return m_refData == brush.m_refData; + return *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData; } bool wxBrush::operator != (const wxBrush& brush) const @@ -169,7 +164,7 @@ bool wxBrush::operator != (const wxBrush& brush) const return m_refData != brush.m_refData; } -bool wxBrush::Ok() const +bool wxBrush::IsOk() const { return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); } @@ -244,7 +239,7 @@ void wxBrush::SetStipple(const wxBitmap& stipple) AllocExclusive(); wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); - wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, + wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, _T("stipple bitmap must be 8x8") ); M_BRUSHDATA->m_stipple = stipple; @@ -266,4 +261,3 @@ wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const { return new wxBrushRefData(*(wxBrushRefData *)data); } -