X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e9a0cc4b727ed06da1a776a1b6c4ba66ed4bde3c:/include/wx/mac/carbon/pen.h?ds=inline

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index f3b4ddffde..607bf38622 100644
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/pen.h
+// Name:        wx/mac/carbon/pen.h
 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pen.h"
-#endif
-
 #include "wx/gdiobj.h"
 #include "wx/colour.h"
 #include "wx/bitmap.h"
@@ -28,7 +24,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
+    virtual ~wxPenRefData();
 
     wxPenRefData& operator=(const wxPenRefData& data);
 
@@ -56,20 +52,17 @@ 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();
+  virtual ~wxPen();
 
-  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
+  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 bool Ok() const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL) ; }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
-  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;