fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[wxWidgets.git] / include / wx / gtk / brush.h

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 6d9a4104297dc07502b8269f68f4becfcb14d9d0..f733ecea5fa9c9c06e45c469f0b622938f4c04a8 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -10,8 +10,8 @@
 #ifndef _WX_GTK_BRUSH_H_
 #define _WX_GTK_BRUSH_H_
 
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -26,11 +26,8 @@ public:
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 
-    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); }
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     virtual int GetStyle() const;
     wxColour &GetColour() const;
@@ -42,9 +39,8 @@ public:
     void SetStipple( const wxBitmap& stipple );
 
 protected:
-    // 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)
 };