made wxString::Replace, Matches and Find work with any form of string argument

[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 ff6f65f12c5cdc22682cd8b8e071ca934199ec67..8da9153e2311e6de06a3a530d897e6690f4a7790 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -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));


@@ -76,7 +76,7 @@ public:
     return m_refData ? penData && *M_PENDATA == *penData : !penData;
   }
 
     return m_refData ? penData && *M_PENDATA == *penData : !penData;
   }
 

-  inline bool operator != (const wxPen& pen) const { return *(this == pen); }
+  inline bool operator != (const wxPen& pen) const { return !(*this == pen); }

 
   virtual bool Ok() const { return IsOk(); }
   virtual bool IsOk() const { return (m_refData != NULL) ; }
 
   virtual bool Ok() const { return IsOk(); }
   virtual bool IsOk() const { return (m_refData != NULL) ; }


@@ -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