X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/236a9de39afa090fdee3cf91cb5364ceca69e3f8..d835f05e11b928b56ecdf9dc305069044dede118:/src/mac/carbon/pen.cpp?ds=inline diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index 65da06087d..bb60cfae65 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -17,7 +17,9 @@ #include "wx/utils.h" #include "wx/pen.h" +#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +#endif wxPenRefData::wxPenRefData() { @@ -26,13 +28,11 @@ wxPenRefData::wxPenRefData() m_join = wxJOIN_ROUND ; m_cap = wxCAP_ROUND ; m_nbDash = 0 ; - m_dash = (wxMACDash*)NULL; -/* TODO: null data - m_hPen = 0; -*/ + m_dash = 0 ; } wxPenRefData::wxPenRefData(const wxPenRefData& data) + : wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -41,28 +41,20 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data) m_nbDash = data.m_nbDash; m_dash = data.m_dash; m_colour = data.m_colour; -/* TODO: null data - m_hPen = 0; -*/ } wxPenRefData::~wxPenRefData() { - // TODO: delete data } // Pens wxPen::wxPen() { - if ( wxThePenList ) - wxThePenList->AddPen(this); } wxPen::~wxPen() { - if (wxThePenList) - wxThePenList->RemovePen(this); } // Should implement Create @@ -76,12 +68,9 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxMACDash*)NULL; + M_PENDATA->m_dash = 0 ; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } wxPen::wxPen(const wxBitmap& stipple, int Width) @@ -94,12 +83,9 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxMACDash*)NULL; + M_PENDATA->m_dash = 0 ; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } void wxPen::Unshare() @@ -168,7 +154,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) Unshare(); M_PENDATA->m_nbDash = nb_dashes; - M_PENDATA->m_dash = (wxMACDash *)Dash; + M_PENDATA->m_dash = (wxDash *)Dash; RealizeResource(); } @@ -193,8 +179,8 @@ void wxPen::SetCap(int Cap) bool wxPen::RealizeResource() { - // TODO: create actual pen - return FALSE; + // nothing to do here for mac + return TRUE; }