// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/utils.h"
#include "wx/pen.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/bitmap.h"
+ #include "wx/colour.h"
+#endif
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData
{
public:
wxPenRefData()
// m_refData unrefed in ~wxObject
}
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const
{
return new wxPenRefData;
}
-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxPenRefData(*(wxPenRefData *)data);
}
M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
}
-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
{
AllocExclusive();
- M_PENDATA->m_stipple = *stipple;;
+ M_PENDATA->m_stipple = *stipple;
}
void wxPen::SetStyle( int style )