reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 642b0cca7d4dccf9f19db1d353746f1146242efd..b6137473ee9d13dc0fca1cc78450a0016cbc7da2 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -15,36 +15,23 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-class WXDLLEXPORT wxColour;
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 // ========================================================================
 // wxPen
 // ========================================================================
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
-    DECLARE_DYNAMIC_CLASS(wxPen)
 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
-    {   return m_refData != pen.m_refData; }
+    virtual ~wxPen();
 
-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    // FIXME: operator==() is wrong
+    bool operator==(const wxPen& pen) const { return m_refData == pen.m_refData; }
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour(const wxColour& col) ;
     void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
@@ -65,7 +52,13 @@ public:
     wxBitmap *GetStipple() const;
 
     WX_NSColor GetNSColor();
-    int GetCocoaLineDash(const float **pattern);
+    int GetCocoaLineDash(const CGFloat **pattern);
+
+protected:
+    wxGDIRefData *CreateGDIRefData() const;
+    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
 #endif // __WX_COCOA_PEN_H__