X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..17808a759627b03c2acbe7333dd2386557e1b804:/src/x11/pen.cpp diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index f6dccc9a9e..079472dbdf 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -12,16 +12,19 @@ // 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() @@ -88,12 +91,12 @@ wxPen::~wxPen() // 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); } @@ -147,7 +150,7 @@ void wxPen::SetStipple( wxBitmap *stipple ) { AllocExclusive(); - M_PENDATA->m_stipple = *stipple;; + M_PENDATA->m_stipple = *stipple; } void wxPen::SetStyle( int style )