set eol-style

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

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 9f46d56becab1e87ac02ab739aad725b1d1d4084..7599f775a7aacc379790c6554b382ff79f2e974f 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -15,8 +15,8 @@
 #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
@@ -39,7 +39,8 @@ public:
     inline bool operator != (const wxPen& pen) const
     {   return m_refData != pen.m_refData; }
 
-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }
 
     void SetColour(const wxColour& col) ;
     void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
@@ -60,7 +61,7 @@ public:
     wxBitmap *GetStipple() const;
 
     WX_NSColor GetNSColor();
-    int GetCocoaLineDash(const float **pattern);
+    int GetCocoaLineDash(const CGFloat **pattern);
 };
 
 #endif // __WX_COCOA_PEN_H__