X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cdd0895f43b739bfc1c3ab43214e1d6f26c561a..ac6178d747f7b3c50a61627c65d6a73ea6dcee5b:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 5d12600bad..cdb9dc8fb2 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 SciTech Software, Inc. (www.scitechsoft.com) +// 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" @@ -32,11 +27,11 @@ class WXDLLEXPORT wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { public: wxBrush() {} - wxBrush(const wxColour &colour, int style); + wxBrush(const wxColour &colour, int style = wxSOLID); wxBrush(const wxBitmap &stippleBitmap); wxBrush(const wxBrush &brush); ~wxBrush() {} @@ -45,7 +40,7 @@ public: bool operator != (const wxBrush& brush) const; bool Ok() const; - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -53,14 +48,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) };