set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 2b71f91e0c454e5e63360c1a4c383f2b9496ff98..236c326b70bb64b146073e9fc7d0b598af1fe59b 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -28,17 +28,12 @@ public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-    wxPen(const wxPen& pen)
-        : wxGDIObject()
-        { Ref(pen); }
     ~wxPen();
 
     // wxObjectRefData
     wxObjectRefData *CreateRefData() const;
     wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    inline wxPen& operator = (const wxPen& pen)
-    {   if (*this == pen) return (*this); Ref(pen); return *this; }
     inline bool operator == (const wxPen& pen) const
     {   return m_refData == pen.m_refData; }
     inline bool operator != (const wxPen& pen) const
@@ -47,7 +42,7 @@ public:
     virtual bool Ok() const { return (m_refData != NULL) ; }
 
     void SetColour(const wxColour& col) ;
-    void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
+    void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
 
     void SetWidth(int width);
     void SetStyle(int style);