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 6756e78083f0cac325976ecbee719e634800469b..236c326b70bb64b146073e9fc7d0b598af1fe59b 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/02 (stubs from 22.03.2003)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/08/02 (stubs from 22.03.2003)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PEN_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_PEN_H__


@@ -28,20 +28,15 @@ public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
     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;
 
     ~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)
+    inline bool operator == (const wxPen& pen) const

     {   return m_refData == pen.m_refData; }
     {   return m_refData == pen.m_refData; }

-    inline bool operator != (const wxPen& pen)
+    inline bool operator != (const wxPen& pen) const

     {   return m_refData != pen.m_refData; }
 
     virtual bool Ok() const { return (m_refData != NULL) ; }
     {   return m_refData != pen.m_refData; }
 
     virtual bool Ok() const { return (m_refData != NULL) ; }


@@ -65,6 +60,7 @@ public:
     wxBitmap *GetStipple() const;
 
     WX_NSColor GetNSColor();
     wxBitmap *GetStipple() const;
 
     WX_NSColor GetNSColor();

+    int GetCocoaLineDash(const float **pattern);

 };
 
 #endif // __WX_COCOA_PEN_H__
 };
 
 #endif // __WX_COCOA_PEN_H__