X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8c9f8f91cd62335261ee29762747218f28d129de:/include/wx/x11/brush.h diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 5a4554bdac..58160f1fc3 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ @@ -30,24 +30,24 @@ class wxBitmap; // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class wxBrush: public wxBrushBase { public: wxBrush() { } - + 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; } - + 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; @@ -60,7 +60,7 @@ private: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxBrush) };