X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..fe828a03f46181cc172bf61739fe09a043f73aea:/include/wx/x11/brush.h diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 1345c82305..93ec215aca 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -18,30 +18,25 @@ // 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 //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush() { } 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 operator == ( const wxBrush& brush ) const; - bool operator != (const wxBrush& brush) const { return !(*this == brush); } + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } virtual int GetStyle() const; wxColour &GetColour() const; @@ -53,12 +48,10 @@ public: void SetStipple( const wxBitmap& stipple ); protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxBrush) }; -#endif -// _WX_BRUSH_H_ +#endif // _WX_BRUSH_H_