X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index cb78791e02..151aef8118 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -6,7 +6,7 @@ // Created: 10/10/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PEN_H_ @@ -25,7 +25,21 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& rData); - ~wxPenRefData(); + virtual ~wxPenRefData(); + + bool operator==(const wxPenRefData& data) const + { + // we intentionally don't compare m_hPen fields here + return m_nStyle == data.m_nStyle && + m_nWidth == data.m_nWidth && + m_nJoin == data.m_nJoin && + m_nCap == data.m_nCap && + m_vColour == data.m_vColour && + (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) && + (m_nStyle != wxUSER_DASH || + (m_dash == data.m_dash && + memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); + } protected: int m_nWidth; @@ -33,6 +47,8 @@ protected: int m_nJoin; int m_nCap; wxBitmap m_vStipple; + int m_nbDash; + wxDash * m_dash; wxColour m_vColour; WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with }; @@ -52,26 +68,27 @@ public: wxPen( const wxBitmap& rStipple ,int nWidth ); - inline wxPen(const wxPen& rPen) { Ref(rPen); } - ~wxPen(); + virtual ~wxPen(); - inline wxPen& operator = (const wxPen& rPen) - { if (*this == rPen) return (*this); Ref(rPen); return *this; } inline bool operator == (const wxPen& rPen) const - { return m_refData == rPen.m_refData; } + { + const wxPenRefData *penData = (wxPenRefData *)rPen.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& rPen) const - { return m_refData != rPen.m_refData; } + { return !(*this == rPen); } - virtual bool Ok(void) const { return (m_refData != NULL); } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk(void) const { return (m_refData != NULL); } // // Override in order to recreate the pen // void SetColour(const wxColour& rColour); - void SetColour( unsigned char cRed - ,unsigned char cGreen - ,unsigned char cBlue - ); + void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue); void SetWidth(int nWidth); void SetStyle(int nStyle); @@ -89,6 +106,13 @@ public: inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); }; inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); }; inline int GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 0); }; + inline int GetDashes(wxDash **ptr) const + { + *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); + return (M_PENDATA ? M_PENDATA->m_nbDash : 0); + } + inline wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }; + inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }; inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); }; @@ -100,8 +124,8 @@ public: // Useful helper: create the brush resource // bool RealizeResource(void); - bool FreeResource(bool bForce = FALSE); - WXHANDLE GetResourceHandle(void); + bool FreeResource(bool bForce = false); + virtual WXHANDLE GetResourceHandle(void) const; bool IsFree(void) const; void Unshare(void);