X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c89f5c02b1ecc6098b21b39b01509dd387c1cb34..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/gtk/brush.h?ds=sidebyside diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 2859c6ad39..f733ecea5f 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/gtk/brush.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,48 +7,29 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GTK_BRUSH_H_ +#define _WX_GTK_BRUSH_H_ -#ifndef __GTKBRUSHH__ -#define __GTKBRUSHH__ - -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxColour; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } - - wxBrush( const wxColour &colour, int style ); + + 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; } - - bool operator == ( const wxBrush& brush ) const; - bool operator != (const wxBrush& brush) const { return !(*this == brush); } + virtual ~wxBrush(); - int GetStyle() const; + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } + + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -57,12 +38,11 @@ public: void SetStyle( int style ); void SetStipple( const wxBitmap& stipple ); -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(wxBrush) }; -#endif // __GTKBRUSHH__ +#endif // _WX_GTK_BRUSH_H_