X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..6a6ea041d96f19c89c0f68741502f08e5cee97ec:/include/wx/palmos/pen.h diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h index de6691ac2a..41a7146509 100644 --- a/include/wx/palmos/pen.h +++ b/include/wx/palmos/pen.h @@ -18,7 +18,7 @@ typedef WXDWORD wxMSWDash; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; // VZ: this class should be made private class WXDLLEXPORT wxPenRefData : public wxGDIRefData @@ -36,7 +36,7 @@ public: m_join == data.m_join && m_cap == data.m_cap && m_colour == data.m_colour && - (m_style != wxSTIPPLE || m_stipple == 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)); @@ -54,7 +54,7 @@ protected: WXHPEN m_hPen; private: - friend class WXDLLEXPORT wxPen; + friend class WXDLLIMPEXP_FWD_CORE wxPen; // Cannot use // DECLARE_NO_COPY_CLASS(wxPenRefData) @@ -77,17 +77,8 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - wxPen(const wxPen& pen) { Ref(pen); } virtual ~wxPen(); - wxPen& operator=(const wxPen& pen) - { - if ( this != &pen ) - Ref(pen); - - return *this; - } - bool operator==(const wxPen& pen) const { const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; @@ -98,7 +89,8 @@ public: bool operator!=(const wxPen& pen) const { return !(*this == pen); } - 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);