/////////////////////////////////////////////////////////////////////////////
-// Name: brush.h
+// Name: wx/mgl/brush.h
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
// 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"
// 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;
void SetColour(unsigned char r, unsigned char g, unsigned char b);
void SetStyle(int style);
void SetStipple(const wxBitmap& stipple);
-
+
// implementation:
void* GetMaskPattern() const;