// Name: brush.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/brush.h"
+#include <gdk/gdk.h>
+
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
class wxBrushRefData: public wxObjectRefData
{
- public:
-
- wxBrushRefData(void);
+public:
+ wxBrushRefData();
wxBrushRefData( const wxBrushRefData& data );
-
+
int m_style;
wxBitmap m_stipple;
wxColour m_colour;
};
-wxBrushRefData::wxBrushRefData(void)
+wxBrushRefData::wxBrushRefData()
{
- m_style = 0;
+ m_style = 0;
}
wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
{
- m_style = data.m_style;
- m_stipple = data.m_stipple;
- m_colour = data.m_colour;
+ m_style = data.m_style;
+ m_stipple = data.m_stipple;
+ m_colour = data.m_colour;
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-wxBrush::wxBrush(void)
+wxBrush::wxBrush()
{
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+ if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
wxBrush::wxBrush( const wxColour &colour, int style )
{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = style;
- M_BRUSHDATA->m_colour = colour;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
+ m_refData = new wxBrushRefData();
+ M_BRUSHDATA->m_style = style;
+ M_BRUSHDATA->m_colour = colour;
-wxBrush::wxBrush( const wxString &colourName, int style )
-{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = style;
- M_BRUSHDATA->m_colour = colourName;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+ if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = wxSTIPPLE;
- M_BRUSHDATA->m_colour = *wxBLACK;
- M_BRUSHDATA->m_stipple = stippleBitmap;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+ m_refData = new wxBrushRefData();
+ M_BRUSHDATA->m_colour = *wxBLACK;
+ M_BRUSHDATA->m_stipple = stippleBitmap;
+ if (M_BRUSHDATA->m_stipple.GetMask())
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ }
+ else
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE;
+ }
+
+ if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
wxBrush::wxBrush( const wxBrush &brush )
{
- Ref( brush );
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
+ Ref( brush );
-wxBrush::wxBrush( const wxBrush *brush )
-{
- if (brush) Ref( *brush );
-
- if (wxTheBrushList) wxTheBrushList->Append( this );
+ if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
-wxBrush::~wxBrush(void)
+wxBrush::~wxBrush()
{
- if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+ if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
}
wxBrush& wxBrush::operator = ( const wxBrush& brush )
{
- if (*this == brush) return (*this);
- Ref( brush );
- return *this;
+ if (*this == brush) return (*this);
+ Ref( brush );
+ return *this;
}
-
+
bool wxBrush::operator == ( const wxBrush& brush )
{
- return m_refData == brush.m_refData;
+ return m_refData == brush.m_refData;
}
bool wxBrush::operator != ( const wxBrush& brush )
{
- return m_refData != brush.m_refData;
+ return m_refData != brush.m_refData;
}
-bool wxBrush::Ok(void) const
+bool wxBrush::Ok() const
{
- return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+ return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
}
-int wxBrush::GetStyle(void) const
+int wxBrush::GetStyle() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( "invalid brush" );
- return 0;
- }
+ if (m_refData == NULL)
+ {
+ wxFAIL_MSG( wxT("invalid brush") );
+ return 0;
+ }
- return M_BRUSHDATA->m_style;
+ return M_BRUSHDATA->m_style;
}
-wxColour &wxBrush::GetColour(void) const
+wxColour &wxBrush::GetColour() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( "invalid brush" );
- return wxNullColour;
- }
-
- return M_BRUSHDATA->m_colour;
-}
+ if (m_refData == NULL)
+ {
+ wxFAIL_MSG( wxT("invalid brush") );
+ return wxNullColour;
+ }
-wxBitmap *wxBrush::GetStipple(void) const
-{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( "invalid brush" );
- return &wxNullBitmap;
- }
-
- return &M_BRUSHDATA->m_stipple;
+ return M_BRUSHDATA->m_colour;
}
-void wxBrush::SetColour( const wxColour& col )
+wxBitmap *wxBrush::GetStipple() const
{
- Unshare();
- M_BRUSHDATA->m_colour = col;
+ if (m_refData == NULL)
+ {
+ wxFAIL_MSG( wxT("invalid brush") );
+ return &wxNullBitmap;
+ }
+
+ return &M_BRUSHDATA->m_stipple;
}
-void wxBrush::SetColour( const wxString& col )
+void wxBrush::SetColour( const wxColour& col )
{
- Unshare();
- M_BRUSHDATA->m_colour = col;
+ Unshare();
+ M_BRUSHDATA->m_colour = col;
}
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
- Unshare();
- M_BRUSHDATA->m_colour.Set( r, g, b );
+ Unshare();
+ M_BRUSHDATA->m_colour.Set( r, g, b );
}
void wxBrush::SetStyle( int style )
{
- Unshare();
- M_BRUSHDATA->m_style = style;
+ Unshare();
+ M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
- Unshare();
- M_BRUSHDATA->m_stipple = stipple;
-}
-
-void wxBrush::Unshare(void)
-{
- if (!m_refData)
- {
- m_refData = new wxBrushRefData();
- }
- else
- {
- wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
- UnRef();
- m_refData = ref;
- }
+ Unshare();
+ M_BRUSHDATA->m_stipple = stipple;
+ if (M_BRUSHDATA->m_stipple.GetMask())
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ }
+ else
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE;
+ }
+}
+
+void wxBrush::Unshare()
+{
+ if (!m_refData)
+ {
+ m_refData = new wxBrushRefData();
+ }
+ else
+ {
+ wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
+ UnRef();
+ m_refData = ref;
+ }
}