mac cleanup

[wxWidgets.git] / include / wx / mac / carbon / pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 4c07343d229532ec9e46df178dd7751d75296265..859448d1544d01a0e861d31b8a152000b278b712 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -16,11 +16,11 @@
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 
 #include "wx/colour.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;

 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);


@@ -36,7 +36,7 @@ public:
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&
                m_join == data.m_join &&
                m_cap == data.m_cap &&
                m_colour == data.m_colour &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (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));
                (m_style != wxUSER_DASH ||
                 (m_nbDash == data.m_nbDash &&
                     memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));


@@ -108,9 +108,8 @@ public:
   // Useful helper: create the brush resource
   bool RealizeResource();
 
   // 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
 };
 
 #endif