X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..c0badae10089ea785072d739df817b1f5f05c088:/src/mgl/pen.cpp?ds=sidebyside diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index ce9e56c741..4c63041cbf 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -15,8 +15,12 @@ #endif #include "wx/pen.h" -#include "wx/bitmap.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif + #include "wx/mgl/private.h" //----------------------------------------------------------------------------- @@ -103,18 +107,6 @@ wxPen::wxPen(const wxBitmap& stipple, int width) wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL); } -wxPen::wxPen(const wxPen& pen) -{ - Ref(pen); -} - -wxPen& wxPen::operator = (const wxPen& pen) -{ - if (*this == pen) return (*this); - Ref(pen); - return *this; -} - bool wxPen::operator == (const wxPen& pen) const { return m_refData == pen.m_refData; @@ -138,7 +130,7 @@ void wxPen::SetDashes(int number_of_dashes, const wxDash *dash) M_PENDATA->m_dash = (wxDash *)dash; /* TODO */ } -void wxPen::SetColour(const unsigned char red, const unsigned char green, const unsigned char blue) +void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue) { AllocExclusive(); M_PENDATA->m_colour.Set(red, green, blue); @@ -245,7 +237,7 @@ void* wxPen::GetPixPattern() const } -bool wxPen::Ok() const +bool wxPen::IsOk() const { return (m_refData != NULL); }