/////////////////////////////////////////////////////////////////////////////
-// Name: brush.h
+// Name: wx/x11/brush.h
// Purpose: wxBrush class
// Author: Julian Smart, Robert Roebling
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "brush.h"
-#endif
-
#include "wx/gdiobj.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxBrush;
-class wxColour;
-class wxBitmap;
+class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxBitmap;
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrush: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
{
public:
wxBrush() { }
-
- wxBrush( const wxColour &colour, int style );
+
+ wxBrush( const wxColour &colour, int style = wxSOLID );
wxBrush( const wxBitmap &stippleBitmap );
- ~wxBrush();
-
- wxBrush( const wxBrush &brush ) { Ref(brush); }
- wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
-
- bool Ok() const { return m_refData != NULL; }
-
+ virtual ~wxBrush();
+
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_refData != NULL; }
+
bool operator == ( const wxBrush& brush ) const;
bool operator != (const wxBrush& brush) const { return !(*this == brush); }
- int GetStyle() const;
+ virtual int GetStyle() const;
wxColour &GetColour() const;
wxBitmap *GetStipple() const;
void SetStyle( int style );
void SetStipple( const wxBitmap& stipple );
-private:
+protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
+
DECLARE_DYNAMIC_CLASS(wxBrush)
};