X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..3ebcfb769f52c756018de75dacf3218ff60a8768:/src/gtk/pen.cpp?ds=inline diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index f928f2fe54..8ac1097aa8 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -14,7 +14,7 @@ #include "wx/pen.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // wxPen @@ -33,7 +33,7 @@ public: int m_capStyle; wxColour m_colour; int m_countDashes; - wxDash *m_dash; + wxGTKDash *m_dash; }; wxPenRefData::wxPenRefData() @@ -42,7 +42,7 @@ wxPenRefData::wxPenRefData() m_style = wxSOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; - m_dash = (wxDash*) NULL; + m_dash = (wxGTKDash*) NULL; m_countDashes = 0; } @@ -100,12 +100,12 @@ wxPen& wxPen::operator = ( const wxPen& pen ) return *this; } -bool wxPen::operator == ( const wxPen& pen ) +bool wxPen::operator == ( const wxPen& pen ) const { return m_refData == pen.m_refData; } -bool wxPen::operator != ( const wxPen& pen ) +bool wxPen::operator != ( const wxPen& pen ) const { return m_refData != pen.m_refData; } @@ -120,7 +120,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash ) { Unshare(); M_PENDATA->m_countDashes = number_of_dashes; - M_PENDATA->m_dash = (wxDash *)dash; /* TODO */ + M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */ } void wxPen::SetColour( int red, int green, int blue ) @@ -155,7 +155,7 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_countDashes : 0); } @@ -166,7 +166,7 @@ int wxPen::GetDashCount() const wxDash* wxPen::GetDash() const { - return (M_PENDATA->m_dash); + return (wxDash*)M_PENDATA->m_dash; } int wxPen::GetCap() const