X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb9d5bd07e7aa0b190c3ee60f5778a974ac9f87b..f90913e2ac7938728beed9065f34b7d4c7593513:/include/wx/gtk1/brush.h diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index 144bb4a1cb..2f7def8807 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/gtk1/brush.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,10 +11,6 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,30 +21,23 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); - ~wxBrush(); - - wxBrush( const wxBrush &brush ) - : wxBrushBase() - { Ref(brush); } - wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - - bool Ok() const { return m_refData != NULL; } + virtual ~wxBrush(); - bool operator == ( const wxBrush& brush ) const; - bool operator != (const wxBrush& brush) const { return !(*this == brush); } + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } virtual int GetStyle() const; wxColour &GetColour() const; @@ -60,9 +49,8 @@ public: void SetStipple( const wxBitmap& stipple ); private: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxBrush) };