X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..4fdfe2f3ae110c1f1ba2d925749cac5b761eff4b:/src/mgl/pen.cpp diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index ce9e56c741..83ad3603da 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" //----------------------------------------------------------------------------- @@ -25,21 +29,37 @@ class wxPenRefData: public wxObjectRefData { - public: - wxPenRefData(); - wxPenRefData(const wxPenRefData& data); - - int m_width; - int m_style; - wxColour m_colour; - wxBitmap m_stipple; - pixpattern24_t m_pixPattern; - - // not used by wxMGL, but we want to preserve values - int m_joinStyle; - int m_capStyle; - int m_countDashes; - wxDash *m_dash; +public: + wxPenRefData(); + wxPenRefData(const wxPenRefData& data); + + bool operator==(const wxPenRefData& data) const + { + // we intentionally don't compare m_hPen fields here + return m_style == data.m_style && + m_width == data.m_width && + memcmp(&m_pixPattern, + &data.m_pixPattern, sizeof(m_pixPattern)) == 0 && + m_capStyle == data.m_capStyle && + m_joinStyle == data.m_joinStyle && + m_colour == data.m_colour && + (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxUSER_DASH || + (m_dash == data.m_dash && + memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0)); + } + + int m_width; + int m_style; + wxColour m_colour; + wxBitmap m_stipple; + pixpattern24_t m_pixPattern; + + // not used by wxMGL, but we want to preserve values + int m_joinStyle; + int m_capStyle; + int m_countDashes; + wxDash *m_dash; }; wxPenRefData::wxPenRefData() @@ -103,21 +123,13 @@ wxPen::wxPen(const wxBitmap& stipple, int width) wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL); } -wxPen::wxPen(const wxPen& pen) +bool wxPen::operator == (const wxPen& pen) const { - Ref(pen); -} + if (m_refData == pen.m_refData) return true; -wxPen& wxPen::operator = (const wxPen& pen) -{ - if (*this == pen) return (*this); - Ref(pen); - return *this; -} + if (!m_refData || !pen.m_refData) return false; -bool wxPen::operator == (const wxPen& pen) const -{ - return m_refData == pen.m_refData; + return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData ); } bool wxPen::operator != (const wxPen& pen) const @@ -138,7 +150,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 +257,7 @@ void* wxPen::GetPixPattern() const } -bool wxPen::Ok() const +bool wxPen::IsOk() const { return (m_refData != NULL); }