/////////////////////////////////////////////////////////////////////////////
-// Name: include/wx/cocoa/brush.h
+// Name: wx/cocoa/brush.h
// Purpose: wxBrush class
// Author: David Elliott <dfe@cox.net>
// Modified by:
// Created: 2003/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BRUSH_H__
// ========================================================================
// wxBrush
// ========================================================================
-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase
{
DECLARE_DYNAMIC_CLASS(wxBrush)
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
public:
wxBrush();
- wxBrush(const wxColour& col, int style);
+ wxBrush(const wxColour& col, int style = wxSOLID);
wxBrush(const wxBitmap& stipple);
- wxBrush(const wxBrush& brush)
- : wxGDIObject()
- { Ref(brush); }
- ~wxBrush();
+ virtual ~wxBrush();
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
- 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 SetStipple(const wxBitmap& stipple) ;
-
- // assignment
- wxBrush& operator = (const wxBrush& brush)
- { if (*this == brush) return (*this); Ref(brush); return *this; }
+ 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 SetStipple(const wxBitmap& stipple) ;
// comparison
- bool operator == (const wxBrush& brush)
+ bool operator == (const wxBrush& brush) const
{ return m_refData == brush.m_refData; }
- bool operator != (const wxBrush& brush)
+ bool operator != (const wxBrush& brush) const
{ return m_refData != brush.m_refData; }
// accessors
wxColour GetColour() const;
- int GetStyle() const;
+ virtual int GetStyle() const;
wxBitmap *GetStipple() const;
virtual bool Ok() const