X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b16de7461ac6d97b0b04a5ce4e73447925e93416:/src/mgl/pen.cpp diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 686e6d46db..5e125c2d03 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$ @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "pen.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -98,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(); @@ -143,7 +138,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); @@ -170,7 +165,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(); @@ -184,20 +179,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 @@ -264,4 +259,3 @@ wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const { return new wxPenRefData(*(wxPenRefData *)data); } -