X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3ab1c18017bb08329e73918f9f502ea00cdb447..51cd351973a7070f5827c65ec47eeb546451c3f1:/include/wx/mac/carbon/pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 511d9a456c..69eae585d3 100644
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -16,47 +16,7 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxPen;
-
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxPen;
-public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    virtual ~wxPenRefData();
-
-    wxPenRefData& operator=(const wxPenRefData& data);
-
-    bool operator==(const wxPenRefData& data) const
-    {
-        // we intentionally don't compare m_hPen fields here
-        return m_style == data.m_style &&
-               m_width == data.m_width &&
-               m_join == data.m_join &&
-               m_cap == data.m_cap &&
-               m_colour == data.m_colour &&
-               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
-               (m_style != wxUSER_DASH ||
-                (m_nbDash == data.m_nbDash &&
-                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
-    }
-
-protected:
-  int           m_width;
-  int           m_style;
-  int           m_join ;
-  int           m_cap ;
-  wxBitmap      m_stipple ;
-  int           m_nbDash ;
-  wxDash *      m_dash ;
-  wxColour      m_colour;
-/* TODO: implementation
-  WXHPEN        m_hPen;
-*/
-};
-
-#define M_PENDATA ((wxPenRefData *)m_refData)
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
@@ -68,18 +28,8 @@ public:
   wxPen(const wxBitmap& stipple, int width);
   virtual ~wxPen();
 
-  inline bool operator == (const wxPen& pen) const
-  {
-    const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
-
-    // an invalid pen is only equal to another invalid pen
-    return m_refData ? penData && *M_PENDATA == *penData : !penData;
-  }
-
-  inline bool operator != (const wxPen& pen) const { return !(*this == pen); }
-
-  virtual bool Ok() const { return IsOk(); }
-  virtual bool IsOk() const { return (m_refData != NULL) ; }
+  bool operator == (const wxPen& pen) const;
+  bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
@@ -92,25 +42,22 @@ public:
   void SetJoin(int join)  ;
   void SetCap(int cap)  ;
 
-  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
-  }
+  wxColour& GetColour() const ;
+  int GetWidth() const;
+  int GetStyle() const;
+  int GetJoin() const;
+  int GetCap() const;
+  int GetDashes(wxDash **ptr) const;
 
-  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
+  wxBitmap *GetStipple() const ;
 
 // Implementation
 
   // Useful helper: create the brush resource
   bool RealizeResource();
 
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+private:
+    void Unshare();
 };
 
 #endif