X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 1c4a29198f..97fccfdd1a 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mgl/brush.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 Vaclav Slavik +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_BRUSH_H__ #define __WX_BRUSH_H__ -#ifdef __GNUG__ -#pragma interface "brush.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,27 +20,26 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { public: - wxBrush(); - wxBrush(const wxColour &colour, int style); + wxBrush() {} + wxBrush(const wxColour &colour, int style = wxSOLID); wxBrush(const wxBitmap &stippleBitmap); - wxBrush(const wxBrush &brush); - ~wxBrush(); - wxBrush& operator = (const wxBrush& brush); + virtual ~wxBrush() {} bool operator == (const wxBrush& brush) const; bool operator != (const wxBrush& brush) const; - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -53,14 +47,17 @@ public: void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetStyle(int style); void SetStipple(const wxBitmap& stipple); - + // implementation: - void Unshare(); - void* GetMaskPattern() const; void* GetPixPattern() const; +protected: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxBrush) };