X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d76048f514b0de4307c2490f8806bf41033bc81a..079f4130b861d094c79e0952966caad8b85dab67:/src/mgl/pen.cpp diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 18c599c477..10af321572 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -1,19 +1,26 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/mgl/pen.cpp // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "pen.h" +#ifdef __BORLANDC__ + #pragma hdrstop #endif #include "wx/pen.h" -#include "wx/bitmap.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/colour.h" +#endif + #include "wx/mgl/private.h" //----------------------------------------------------------------------------- @@ -22,27 +29,43 @@ 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 != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxPENSTYLE_USER_DASH || + (m_dash == data.m_dash && + memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0)); + } + + int m_width; + wxPenStyle m_style; + wxColour m_colour; + wxBitmap m_stipple; + pixpattern24_t m_pixPattern; + + // not used by wxMGL, but we want to preserve values + wxPenJoin m_joinStyle; + wxPenCap m_capStyle; + int m_countDashes; + wxDash *m_dash; }; wxPenRefData::wxPenRefData() { m_width = 1; - m_style = wxSOLID; + m_style = wxPENSTYLE_SOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; m_dash = (wxDash*) NULL; @@ -79,7 +102,7 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data) IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -wxPen::wxPen(const wxColour &colour, int width, int style) +wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; @@ -87,34 +110,36 @@ wxPen::wxPen(const wxColour &colour, int width, int style) M_PENDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) +{ + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = (wxPenStyle)style; + M_PENDATA->m_colour = colour; +} +#endif + wxPen::wxPen(const wxBitmap& stipple, int width) { wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); - wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, + wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, _T("stipple bitmap must be 8x8") ); m_refData = new wxPenRefData(); M_PENDATA->m_width = width; - M_PENDATA->m_style = wxSTIPPLE; + M_PENDATA->m_style = wxPENSTYLE_STIPPLE; M_PENDATA->m_stipple = stipple; 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 @@ -124,89 +149,95 @@ bool wxPen::operator != (const wxPen& pen) const void wxPen::SetColour(const wxColour &colour) { - Unshare(); + AllocExclusive(); M_PENDATA->m_colour = colour; } void wxPen::SetDashes(int number_of_dashes, const wxDash *dash) { - Unshare(); + AllocExclusive(); M_PENDATA->m_countDashes = number_of_dashes; M_PENDATA->m_dash = (wxDash *)dash; /* TODO */ } -void wxPen::SetColour(int red, int green, int blue) +void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue) { - Unshare(); + AllocExclusive(); M_PENDATA->m_colour.Set(red, green, blue); } -void wxPen::SetCap(int capStyle) +void wxPen::SetCap(wxPenCap capStyle) { - Unshare(); + AllocExclusive(); M_PENDATA->m_capStyle = capStyle; } -void wxPen::SetJoin(int joinStyle) +void wxPen::SetJoin(wxPenJoin joinStyle) { - Unshare(); + AllocExclusive(); M_PENDATA->m_joinStyle = joinStyle; } -void wxPen::SetStyle(int style) +void wxPen::SetStyle(wxPenStyle style) { - Unshare(); + AllocExclusive(); M_PENDATA->m_style = style; } void wxPen::SetStipple(const wxBitmap& stipple) { wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); - wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, + wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, _T("stipple bitmap must be 8x8") ); - Unshare(); + AllocExclusive(); M_PENDATA->m_stipple = stipple; wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL); } void wxPen::SetWidth(int width) { - Unshare(); + AllocExclusive(); M_PENDATA->m_width = width; } -int wxPen::GetDashes(wxDash **ptr) const +int wxPen::GetDashes(wxDash **ptr) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } -int wxPen::GetDashCount() const -{ - return (M_PENDATA->m_countDashes); +int wxPen::GetDashCount() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + return (M_PENDATA->m_countDashes); } -wxDash* wxPen::GetDash() const -{ - return (wxDash*)M_PENDATA->m_dash; +wxDash* wxPen::GetDash() const +{ + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + + return (wxDash*)M_PENDATA->m_dash; } -int wxPen::GetCap() const +wxPenCap wxPen::GetCap() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } -int wxPen::GetJoin() const +wxPenJoin wxPen::GetJoin() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } -int wxPen::GetStyle() const +wxPenStyle wxPen::GetStyle() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); @@ -220,7 +251,7 @@ int wxPen::GetWidth() const return M_PENDATA->m_width; } -wxColour &wxPen::GetColour() const +wxColour wxPen::GetColour() const { wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); @@ -242,22 +273,12 @@ void* wxPen::GetPixPattern() const } -bool wxPen::Ok() const +wxGDIRefData *wxPen::CreateGDIRefData() const { - return (m_refData != NULL); + return new wxPenRefData; } -void wxPen::Unshare() +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const { - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData ); - UnRef(); - m_refData = ref; - } + return new wxPenRefData(*(wxPenRefData *)data); } -