X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/738f9e5a12b8bb3936cc10347be98390602d3660..73bb67760795ef047ca16c1f151ba49c77eaef62:/include/wx/gtk1/brush.h diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index d42e564a81..de6bf6f62a 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -11,7 +11,7 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -34,15 +34,21 @@ class wxBrush; class wxBrush: public wxGDIObject { public: - wxBrush(); - wxBrush( const wxColour &colour, int style ); + wxBrush() { } + + 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; + + wxBrush( const wxBrush &brush ) + : wxGDIObject() + { 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; wxColour &GetColour() const; @@ -53,9 +59,11 @@ public: 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; + DECLARE_DYNAMIC_CLASS(wxBrush) };