#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "brush.h"
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
// ----------------------------------------------------------------------------
// wxBrush
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxBrush : public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
{
public:
wxBrush();
- wxBrush(const wxColour& col, int style = wxSOLID);
+ wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
wxBrush(const wxBitmap& stipple);
- wxBrush(const wxBrush& brush) { Ref(brush); }
virtual ~wxBrush();
virtual void SetColour(const wxColour& col);
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
- virtual void SetStyle(int style);
+ virtual void SetStyle(wxBrushStyle 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;
+ wxBrushStyle GetStyle() const;
wxBitmap *GetStipple() const;
- bool Ok() const { return m_refData != NULL; }
-
// return the HBRUSH for this brush
virtual WXHANDLE GetResourceHandle() const;
protected:
- virtual wxObjectRefData *CreateRefData() const;
- virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxBrush)
};
-#endif
- // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_