X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f22cf8ddb6d4c75eee97d1320ba20f7c82753c8..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/include/wx/gtk/brush.h diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index c52eb45011..144bb4a1cb 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -11,7 +11,7 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -31,23 +31,26 @@ class wxBrush; // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class wxBrush: public wxBrushBase { - DECLARE_DYNAMIC_CLASS(wxBrush) +public: + wxBrush() { } - public: - - wxBrush(); - wxBrush( const wxColour &colour, int style ); + wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - wxBrush( const wxBrush &brush ); ~wxBrush(); - wxBrush& operator = ( const wxBrush& brush ); - bool operator == ( const wxBrush& brush ); - bool operator != ( const wxBrush& brush ); - bool Ok() const; - int GetStyle() const; + wxBrush( const wxBrush &brush ) + : wxBrushBase() + { 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); } + + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -56,9 +59,12 @@ class wxBrush: public wxGDIObject void SetStyle( int style ); void SetStipple( const wxBitmap& stipple ); - void Unshare(); +private: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - // no data :-) + DECLARE_DYNAMIC_CLASS(wxBrush) }; #endif // __GTKBRUSHH__