X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..af1a6227cc5b17afeded61658fb7a7dc3e862d8a:/include/wx/gtk/pen.h?ds=sidebyside diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 17dd2ab6b3..8be99f28b9 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -22,11 +22,7 @@ class WXDLLIMPEXP_CORE wxPen; -#if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; -#else -typedef gchar wxGTKDash; -#endif //----------------------------------------------------------------------------- // wxPen @@ -40,18 +36,13 @@ public: wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); ~wxPen(); - wxPen( const wxPen& pen ) - : wxGDIObject() - { Ref(pen); } - wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; } - bool Ok() const { return m_refData != NULL; } bool operator == ( const wxPen& pen ) const; bool operator != (const wxPen& pen) const { return !(*this == pen); } void SetColour( const wxColour &colour ); - void SetColour( const unsigned char red, const unsigned char green, const unsigned char blue ); + void SetColour( unsigned char red, unsigned char green, unsigned char blue ); void SetCap( int capStyle ); void SetJoin( int joinStyle ); void SetStyle( int style ); @@ -67,7 +58,7 @@ public: int GetDashCount() const; wxDash* GetDash() const; -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;