X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index fbfdd8df2a..1bbf1a538b 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mgl/brush.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -7,14 +7,9 @@ // 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/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -32,26 +27,22 @@ class WXDLLEXPORT wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { public: 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; - bool IsHatch() const - { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); } - void SetColour(const wxColour& col); void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetStyle(int style);