/////////////////////////////////////////////////////////////////////////////
-// Name: brush.cpp
+// Name: src/gtk1/brush.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/brush.h"
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
+
+#include <gdk/gdk.h>
+
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData: public wxObjectRefData
-{
- public:
-
- wxBrushRefData(void);
- wxBrushRefData( const wxBrushRefData& data );
-
- int m_style;
- wxBitmap m_stipple;
- wxColour m_colour;
+class wxBrushRefData: public wxGDIRefData
+{
+public:
+ wxBrushRefData()
+ {
+ m_style = 0;
+ }
+
+ wxBrushRefData( const wxBrushRefData& data )
+ : wxGDIRefData()
+ {
+ m_style = data.m_style;
+ m_stipple = data.m_stipple;
+ m_colour = data.m_colour;
+ }
+
+ 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;
};
-wxBrushRefData::wxBrushRefData(void)
-{
- m_style = 0;
-}
-
-wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
-{
- m_style = data.m_style;
- m_stipple = data.m_stipple;
- m_colour = data.m_colour;
-}
-
//-----------------------------------------------------------------------------
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-wxBrush::wxBrush(void)
-{
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-
-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 (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 )
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_style = style;
- M_BRUSHDATA->m_colour = colourName;
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+ m_refData = new wxBrushRefData;
+ M_BRUSHDATA->m_style = (wxBrushStyle)style;
+ M_BRUSHDATA->m_colour = colour;
}
+#endif
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;
-wxBrush::wxBrush( const wxBrush &brush )
-{
- Ref( brush );
-
- if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
+ M_BRUSHDATA->m_stipple = stippleBitmap;
-wxBrush::wxBrush( const wxBrush *brush )
-{
- if (brush) Ref( *brush );
-
- if (wxTheBrushList) wxTheBrushList->Append( this );
+ if (M_BRUSHDATA->m_stipple.GetMask())
+ M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ else
+ M_BRUSHDATA->m_style = wxSTIPPLE;
}
-wxBrush::~wxBrush(void)
+wxBrush::~wxBrush()
{
- if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+ // m_refData unrefed in ~wxObject
}
-wxBrush& wxBrush::operator = ( const wxBrush& brush )
-{
- if (*this == brush) return (*this);
- Ref( brush );
- return *this;
-}
-
-bool wxBrush::operator == ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CreateGDIRefData() const
{
- return m_refData == brush.m_refData;
+ return new wxBrushRefData;
}
-bool wxBrush::operator != ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
{
- return m_refData != brush.m_refData;
+ return new wxBrushRefData(*(wxBrushRefData *)data);
}
-bool wxBrush::Ok(void) const
+bool wxBrush::operator == ( const wxBrush& brush ) const
{
- return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+ if (m_refData == brush.m_refData) return true;
+
+ if (!m_refData || !brush.m_refData) return false;
+
+ return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
}
-int wxBrush::GetStyle(void) const
+wxBrushStyle wxBrush::GetStyle() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( "invalid brush" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );
- 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;
+ wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+
+ return M_BRUSHDATA->m_colour;
}
-wxBitmap *wxBrush::GetStipple(void) const
+wxBitmap *wxBrush::GetStipple() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( "invalid brush" );
- return &wxNullBitmap;
- }
-
- return &M_BRUSHDATA->m_stipple;
+ wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+
+ return &M_BRUSHDATA->m_stipple;
}
void wxBrush::SetColour( const wxColour& col )
{
- Unshare();
- M_BRUSHDATA->m_colour = col;
-}
+ AllocExclusive();
-void wxBrush::SetColour( const wxString& col )
-{
- Unshare();
- M_BRUSHDATA->m_colour = col;
+ 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 );
+ AllocExclusive();
+
+ M_BRUSHDATA->m_colour.Set( r, g, b );
}
-void wxBrush::SetStyle( int style )
+void wxBrush::SetStyle( wxBrushStyle style )
{
- Unshare();
- M_BRUSHDATA->m_style = style;
+ AllocExclusive();
+
+ M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
- Unshare();
- M_BRUSHDATA->m_stipple = stipple;
-}
+ AllocExclusive();
-void wxBrush::Unshare(void)
-{
- if (!m_refData)
- {
- m_refData = new wxBrushRefData();
- }
- else
- {
- wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
- UnRef();
- m_refData = ref;
- }
+ M_BRUSHDATA->m_stipple = stipple;
+ if (M_BRUSHDATA->m_stipple.GetMask())
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ }
+ else
+ {
+ M_BRUSHDATA->m_style = wxSTIPPLE;
+ }
}
-
projects / wxWidgets.git / blobdiff