X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd3e41f6003fa1d589c1477a327931c3f57516f2..e152afc3d45b72468b14ba15ab6badc19c735a70:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index cc24520fb3..2185169aff 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: @@ -46,18 +46,18 @@ 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(); - 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); } @@ -65,10 +65,7 @@ public: // 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); @@ -97,7 +94,7 @@ public: // Useful helper: create the brush resource // bool RealizeResource(void); - bool FreeResource(bool bForce = FALSE); + bool FreeResource(bool bForce = false); WXHANDLE GetResourceHandle(void); bool IsFree(void) const; void Unshare(void);