set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 728a0ab2deffd413c2eacb2bce63f4221cb5d72f..689981f391f96452737415178de41934574c9f2a 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/cocoa/brush.h
+// Name:        wx/cocoa/brush.h
 // Purpose:     wxBrush class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
@@ -31,22 +31,15 @@ public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
-    wxBrush(const wxBrush& brush)
-    :   wxBrushBase()
-    {   Ref(brush); }
     ~wxBrush();
 
 // ------------------------------------------------------------------------
 // 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
     bool operator == (const wxBrush& brush) const