X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/pen.cpp diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index 3c3d9f033b..8d6461dd97 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -1,29 +1,66 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/mac/carbon/pen.cpp // Purpose: wxPen // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "pen.h" -#endif +#include "wx/wxprec.h" -#include "wx/setup.h" -#include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +#ifndef WX_PRECOMP + #include "wx/utils.h" #endif +IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) + +class WXDLLEXPORT wxPenRefData : public wxGDIRefData +{ +public: + wxPenRefData(); + wxPenRefData(const wxPenRefData& data); + virtual ~wxPenRefData(); + + wxPenRefData& operator=(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 && + m_join == data.m_join && + m_cap == data.m_cap && + m_colour == data.m_colour && + (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxPENSTYLE_USER_DASH || + (m_nbDash == data.m_nbDash && + memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); + } + +protected: + int m_width; + wxPenStyle m_style; + wxPenJoin m_join ; + wxPenCap m_cap ; + wxBitmap m_stipple ; + int m_nbDash ; + wxDash * m_dash ; + wxColour m_colour; + /* TODO: implementation + WXHPEN m_hPen; + */ + + friend class WXDLLIMPEXP_FWD_CORE wxPen; +}; + wxPenRefData::wxPenRefData() { - m_style = wxSOLID; + m_style = wxPENSTYLE_SOLID; m_width = 1; m_join = wxJOIN_ROUND ; m_cap = wxCAP_ROUND ; @@ -32,7 +69,7 @@ wxPenRefData::wxPenRefData() } wxPenRefData::wxPenRefData(const wxPenRefData& data) - : wxGDIRefData() +: wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -49,6 +86,8 @@ wxPenRefData::~wxPenRefData() // Pens +#define M_PENDATA ((wxPenRefData *)m_refData) + wxPen::wxPen() { } @@ -58,7 +97,7 @@ wxPen::~wxPen() } // Should implement Create -wxPen::wxPen(const wxColour& col, int Width, int Style) +wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style) { m_refData = new wxPenRefData; @@ -73,13 +112,30 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) RealizeResource(); } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& col, int Width, int Style) +{ + m_refData = new wxPenRefData; + + M_PENDATA->m_colour = col; + M_PENDATA->m_width = Width; + M_PENDATA->m_style = (wxPenStyle)Style; + M_PENDATA->m_join = wxJOIN_ROUND ; + M_PENDATA->m_cap = wxCAP_ROUND ; + M_PENDATA->m_nbDash = 0 ; + M_PENDATA->m_dash = 0 ; + + RealizeResource(); +} +#endif + wxPen::wxPen(const wxBitmap& stipple, int Width) { m_refData = new wxPenRefData; M_PENDATA->m_stipple = stipple; M_PENDATA->m_width = Width; - M_PENDATA->m_style = wxSTIPPLE; + M_PENDATA->m_style = wxPENSTYLE_STIPPLE; M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; @@ -88,19 +144,87 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) RealizeResource(); } +wxGDIRefData *wxPen::CreateGDIRefData() const +{ + return new wxPenRefData; +} + +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxPenRefData(*wx_static_cast(const wxPenRefData *, data)); +} + +bool wxPen::operator==(const wxPen& pen) const +{ + const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; + + // an invalid pen is only equal to another invalid pen + return m_refData ? penData && *M_PENDATA == *penData : !penData; +} + +wxColour& wxPen::GetColour() const +{ + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + + return M_PENDATA->m_colour; +} + +int wxPen::GetWidth() const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + return M_PENDATA->m_width; +} + +wxPenStyle wxPen::GetStyle() const +{ + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_style; +} + +wxPenJoin wxPen::GetJoin() const +{ + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_join; +} + +wxPenCap wxPen::GetCap() const +{ + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_cap; +} + +int wxPen::GetDashes(wxDash **ptr) const +{ + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = M_PENDATA->m_dash; + return M_PENDATA->m_nbDash; +} + +wxBitmap *wxPen::GetStipple() const +{ + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + + return &M_PENDATA->m_stipple; +} + void wxPen::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxPenRefData(); - } + m_refData = new wxPenRefData(); + } else { - wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxPen::SetColour(const wxColour& col) @@ -108,7 +232,7 @@ void wxPen::SetColour(const wxColour& col) Unshare(); M_PENDATA->m_colour = col; - + RealizeResource(); } @@ -117,7 +241,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) Unshare(); M_PENDATA->m_colour.Set(r, g, b); - + RealizeResource(); } @@ -130,7 +254,7 @@ void wxPen::SetWidth(int Width) RealizeResource(); } -void wxPen::SetStyle(int Style) +void wxPen::SetStyle(wxPenStyle Style) { Unshare(); @@ -144,8 +268,8 @@ void wxPen::SetStipple(const wxBitmap& Stipple) Unshare(); M_PENDATA->m_stipple = Stipple; - M_PENDATA->m_style = wxSTIPPLE; - + M_PENDATA->m_style = wxPENSTYLE_STIPPLE; + RealizeResource(); } @@ -155,11 +279,11 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_dash = (wxDash *)Dash; - + RealizeResource(); } -void wxPen::SetJoin(int Join) +void wxPen::SetJoin(wxPenJoin Join) { Unshare(); @@ -168,7 +292,7 @@ void wxPen::SetJoin(int Join) RealizeResource(); } -void wxPen::SetCap(int Cap) +void wxPen::SetCap(wxPenCap Cap) { Unshare(); @@ -179,8 +303,6 @@ void wxPen::SetCap(int Cap) bool wxPen::RealizeResource() { - // nothing to do here for mac - return TRUE; + // nothing to do here for mac + return true; } - -