Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 8734ef18de6d07591ff0b9d26e166a8cfed995b0..f733ecea5fa9c9c06e45c469f0b622938f4c04a8 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -7,21 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 //-----------------------------------------------------------------------------
 // wxBrush


@@ -34,12 +24,10 @@ public:
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );

-    ~wxBrush();
-
-    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;
 
     virtual int GetStyle() const;
     wxColour &GetColour() const;


@@ -51,11 +39,10 @@ public:
     void SetStipple( const wxBitmap& stipple );
 
 protected:
     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)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 

-#endif // __GTKBRUSHH__
+#endif // _WX_GTK_BRUSH_H_