X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..fea35690f171f9677bd9f949c0af3dc16d1a9576:/include/wx/gtk/brush.h?ds=sidebyside

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 8734ef18de..6d9a410429 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_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -34,9 +24,10 @@ public:
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
-    ~wxBrush();
+    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); }
@@ -58,4 +49,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
-#endif // __GTKBRUSHH__
+#endif // _WX_GTK_BRUSH_H_