#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#ifdef __GNUG__
- #pragma interface "brush.h"
-#endif
-
#include "wx/gdicmn.h"
#include "wx/gdiobj.h"
#include "wx/bitmap.h"
// wxBrush
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxBrush : public wxGDIObject
+class WXDLLEXPORT wxBrush : public wxBrushBase
{
public:
wxBrush();
- wxBrush(const wxColour& col, int style);
+ wxBrush(const wxColour& col, int style = wxSOLID);
wxBrush(const wxBitmap& stipple);
- wxBrush(const wxBrush& brush) { Ref(brush); }
virtual ~wxBrush();
virtual void SetColour(const wxColour& col);
virtual void SetStyle(int style);
virtual void SetStipple(const wxBitmap& stipple);
- wxBrush& operator=(const wxBrush& brush);
bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
wxColour GetColour() const;
- int GetStyle() const;
+ virtual int GetStyle() const;
wxBitmap *GetStipple() const;
- bool Ok() const { return m_refData != NULL; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_refData != NULL; }
- // create (if necessary) and return the HBRUSH for this brush
- WXHBRUSH GetResourceHandle() const;
+ // return the HBRUSH for this brush
+ virtual WXHANDLE GetResourceHandle() const;
protected:
virtual wxObjectRefData *CreateRefData() const;