X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..8b4457965a0c0d0ef828dbf7cca3d2f947083054:/src/mgl/pen.cpp diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index f4a878aefb..a98e011a9e 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/mgl/pen.cpp // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -93,7 +93,7 @@ wxPen::wxPen(const wxColour &colour, int width, int style) 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(); @@ -103,18 +103,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 +126,7 @@ void wxPen::SetDashes(int number_of_dashes, const wxDash *dash) 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) { AllocExclusive(); M_PENDATA->m_colour.Set(red, green, blue); @@ -165,7 +153,7 @@ void wxPen::SetStyle(int 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") ); AllocExclusive(); @@ -179,20 +167,20 @@ void wxPen::SetWidth(int width) 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); + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_countDashes : 0); } -int wxPen::GetDashCount() const -{ - return (M_PENDATA->m_countDashes); +int wxPen::GetDashCount() const +{ + return (M_PENDATA->m_countDashes); } -wxDash* wxPen::GetDash() const -{ - return (wxDash*)M_PENDATA->m_dash; +wxDash* wxPen::GetDash() const +{ + return (wxDash*)M_PENDATA->m_dash; } int wxPen::GetCap() const @@ -259,4 +247,3 @@ wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const { return new wxPenRefData(*(wxPenRefData *)data); } -