X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/x11/pen.h diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 40f0ccf341..ccb6310eb5 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -19,9 +19,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPen; -class WXDLLIMPEXP_CORE wxColour; -class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxPen; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; typedef char wxX11Dash; @@ -36,18 +36,16 @@ public: wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); wxPen( const wxBitmap &stipple, int width ); - ~wxPen(); + virtual ~wxPen(); - wxPen( const wxPen& pen ) { Ref(pen); } - wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; } - - bool Ok() const { return m_refData != NULL; } + bool Ok() const { return IsOk(); } + bool IsOk() 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 ); @@ -65,7 +63,7 @@ public: wxDash* GetDash() const; wxBitmap* GetStipple() const; -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;