X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c2b9ae5f7fdabc38a9814b5a1a8d16932a610024:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 7787c2c407..8208130df5 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,20 +27,18 @@ 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; - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -53,7 +46,7 @@ public: void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetStyle(int style); void SetStipple(const wxBitmap& stipple); - + // implementation: void* GetMaskPattern() const;