X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd3e41f6003fa1d589c1477a327931c3f57516f2..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index cc24520fb3..233016dc12 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/os2/pen.h // Purpose: wxPen class // Author: David Webster // Modified by: @@ -25,7 +25,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& rData); - ~wxPenRefData(); + virtual ~wxPenRefData(); protected: int m_nWidth; @@ -33,6 +33,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 }; @@ -46,29 +48,27 @@ class WXDLLEXPORT wxPen : public wxGDIObject public: wxPen(); wxPen( const wxColour& rColour - ,int nWidth - ,int nStyle + ,int nWidth = 1 + ,int nStyle = wxSOLID ); 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) { return m_refData == rPen.m_refData; } - inline bool operator != (const wxPen& rPen) { return m_refData != rPen.m_refData; } + inline bool operator == (const wxPen& rPen) const + { return m_refData == rPen.m_refData; } + inline bool operator != (const wxPen& rPen) const + { return m_refData != rPen.m_refData; } - 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); @@ -86,6 +86,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); }; @@ -97,8 +104,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);