/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/brush.cpp
+// Name: src/gtk1/brush.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#include "wx/wxprec.h"
#include "wx/brush.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
#include <gdk/gdk.h>
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData: public wxGDIRefData
{
public:
wxBrushRefData()
}
wxBrushRefData( const wxBrushRefData& data )
- : wxObjectRefData()
+ : wxGDIRefData()
{
m_style = data.m_style;
m_stipple = data.m_stipple;
bool operator == (const wxBrushRefData& data) const
{
return (m_style == data.m_style &&
- m_stipple == data.m_stipple &&
+ m_stipple.IsSameAs(data.m_stipple) &&
m_colour == data.m_colour);
}
// m_refData unrefed in ~wxObject
}
-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);
}
M_BRUSHDATA->m_colour = col;
}
-void wxBrush::SetColour( const unsigned char r, const unsigned char g, const unsigned char b )
+void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
AllocExclusive();