X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/x11/brush.h diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 4ea94c15fc..ce581ab06d 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -1,53 +1,47 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/x11/brush.h // Purpose: wxBrush class // Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "brush.h" -#endif - #include "wx/gdiobj.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxBrush; -class wxColour; -class wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } - + wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); - - wxBrush( const wxBrush &brush ) { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - - bool Ok() const { return m_refData != NULL; } - + virtual ~wxBrush(); + + 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); } - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -56,11 +50,11 @@ 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; - + DECLARE_DYNAMIC_CLASS(wxBrush) };