X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..9b4da62701dbe8ccfbe447ce8d1bc77fcb40e9e5:/include/wx/x11/pen.h diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index d5c042a14d..e7d259bc9d 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,12 +36,7 @@ public: wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); wxPen( const wxBitmap &stipple, int width ); - ~wxPen(); - - wxPen( const wxPen& pen ) { Ref(pen); } - wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; } - - bool Ok() const { return m_refData != NULL; } + virtual ~wxPen(); bool operator == ( const wxPen& pen ) const; bool operator != (const wxPen& pen) const { return !(*this == pen); } @@ -65,13 +60,11 @@ public: wxDash* GetDash() const; wxBitmap* GetStipple() const; -private: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; +protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxPen) }; -#endif -// _WX_PEN_H_ +#endif // _WX_PEN_H_