/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "brush.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/brush.h"
#include "wx/mgl/private.h"
-#include "wx/mgl/dcmemory.h"
+#include "wx/dcmemory.h"
// ---------------------------------------------------------------------------
// 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();
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();
}
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData : public wxGDIRefData
{
public:
wxBrushRefData();
wxBrushRefData(const wxBrushRefData& data);
- int m_style;
+ virtual bool IsOk() const { return m_colour.IsOk(); }
+
+ bool operator==(const wxBrushRefData& data) const
+ {
+ return (m_style == data.m_style &&
+ m_stipple.IsSameAs(data.m_stipple) &&
+ m_colour == data.m_colour);
+ }
+
+ wxBrushStyle m_style;
wxColour m_colour;
wxBitmap m_stipple;
pixpattern24_t m_pixPattern;
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-wxBrush::wxBrush(const wxColour &colour, int style)
+wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
M_BRUSHDATA->m_colour = colour;
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+ m_refData = new wxBrushRefData;
+ M_BRUSHDATA->m_style = (wxBrushStyle)style;
+ M_BRUSHDATA->m_colour = colour;
+}
+#endif
+
wxBrush::wxBrush(const wxBitmap &stippleBitmap)
{
- wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") );
- wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,
- _T("stipple bitmap must be 8x8") );
+ wxCHECK_RET( stippleBitmap.Ok(), wxT("invalid bitmap") );
+ wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,
+ wxT("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
return m_refData != brush.m_refData;
}
-bool wxBrush::Ok() const
-{
- return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
-}
-
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return 0;
- }
+ wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
return M_BRUSHDATA->m_style;
}
-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return wxNullColour;
- }
+ wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
return M_BRUSHDATA->m_colour;
}
wxBitmap *wxBrush::GetStipple() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return &wxNullBitmap;
- }
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );
return &M_BRUSHDATA->m_stipple;
}
M_BRUSHDATA->m_colour.Set(r, g, b);
}
-void wxBrush::SetStyle( int style )
+void wxBrush::SetStyle( wxBrushStyle style )
{
AllocExclusive();
M_BRUSHDATA->m_style = style;
{
AllocExclusive();
- wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
- wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
- _T("stipple bitmap must be 8x8") );
+ wxCHECK_RET( stipple.Ok(), wxT("invalid bitmap") );
+ wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
+ wxT("stipple bitmap must be 8x8") );
M_BRUSHDATA->m_stipple = stipple;
wxBitmapToPixPattern(stipple, &(M_BRUSHDATA->m_pixPattern),
M_BRUSHDATA->m_style = wxSTIPPLE;
}
-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const
{
return new wxBrushRefData;
}
-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}
-
projects / wxWidgets.git / blobdiff