X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/x11/brush.h diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 6f4f1536f8..ce581ab06d 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -18,9 +18,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBrush; -class WXDLLIMPEXP_CORE wxColour; -class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; //----------------------------------------------------------------------------- // wxBrush @@ -33,12 +33,10 @@ public: wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); + virtual ~wxBrush(); - wxBrush( const wxBrush &brush ) { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - - bool Ok() const { return m_refData != NULL; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_refData != NULL; } bool operator == ( const wxBrush& brush ) const; bool operator != (const wxBrush& brush) const { return !(*this == brush); } @@ -52,7 +50,7 @@ public: void SetStyle( int style ); void SetStipple( const wxBitmap& stipple ); -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;