adopting correct implementation virtualization for Do/GradientFillConcentric

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 28e4efa76f87d946f2bd891cfd84095b1c9e0530..a7639fc9989a571b60a113ffe197c750c353ea35 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/cocoa/brush.h
+// Name:        wx/cocoa/brush.h

 // Purpose:     wxBrush class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Purpose:     wxBrush class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BRUSH_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BRUSH_H__


@@ -21,7 +21,7 @@ class WXDLLEXPORT wxBrush;
 // ========================================================================
 // wxBrush
 // ========================================================================
 // ========================================================================
 // wxBrush
 // ========================================================================

-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase

 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------


@@ -29,34 +29,27 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 // ------------------------------------------------------------------------
 public:
     wxBrush();
 // ------------------------------------------------------------------------
 public:
     wxBrush();

-    wxBrush(const wxColour& col, int style);
+    wxBrush(const wxColour& col, int style = wxSOLID);

     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush)
-    :   wxGDIObject()
-    {   Ref(brush); }
-    ~wxBrush();
+    virtual ~wxBrush();

 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------

-    virtual void SetColour(const wxColour& col)  ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-    virtual void SetStyle(int style)  ;
-    virtual void SetStipple(const wxBitmap& stipple)  ;
-
-    // assignment
-    wxBrush& operator = (const wxBrush& brush)
-    {   if (*this == brush) return (*this); Ref(brush); return *this; }
+    virtual void SetColour(const wxColour& col) ;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
+    virtual void SetStyle(int style) ;
+    virtual void SetStipple(const wxBitmap& stipple) ;

 
     // comparison
 
     // comparison

-    bool operator == (const wxBrush& brush)
+    bool operator == (const wxBrush& brush) const

     {   return m_refData == brush.m_refData; }
     {   return m_refData == brush.m_refData; }

-    bool operator != (const wxBrush& brush)
+    bool operator != (const wxBrush& brush) const

     {   return m_refData != brush.m_refData; }
 
     // accessors
     wxColour GetColour() const;
     {   return m_refData != brush.m_refData; }
 
     // accessors
     wxColour GetColour() const;

-    int GetStyle() const;
+    virtual int GetStyle() const;

     wxBitmap *GetStipple() const;
 
     virtual bool Ok() const
     wxBitmap *GetStipple() const;
 
     virtual bool Ok() const