X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..60dd3c0916772e3e64fde7c83d359daae02b40a6:/include/wx/gtk/brush.h diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 1eb28335a6..e0bfc9ff5d 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -7,21 +7,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GTK_BRUSH_H_ +#define _WX_GTK_BRUSH_H_ -#ifndef __GTKBRUSHH__ -#define __GTKBRUSHH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxColour; //----------------------------------------------------------------------------- // wxBrush @@ -34,14 +24,10 @@ public: 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; } + virtual ~wxBrush(); - bool Ok() const { return m_refData != NULL; } + 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); } @@ -63,4 +49,4 @@ protected: DECLARE_DYNAMIC_CLASS(wxBrush) }; -#endif // __GTKBRUSHH__ +#endif // _WX_GTK_BRUSH_H_