X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/078cf5cb756c4f4113d7acf04ebd6a2535ef75b3..a387938f80a2804f259e7305513231be39620fd2:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index a81ee0a9e6..57d5f1c0d6 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/pen.h +// Name: wx/msw/pen.h // Purpose: wxPen class // Author: Julian Smart // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=() @@ -12,10 +12,6 @@ #ifndef _WX_PEN_H_ #define _WX_PEN_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "pen.h" -#endif - #include "wx/gdiobj.h" #include "wx/bitmap.h" #include "wx/colour.h" @@ -81,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; @@ -102,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); @@ -142,4 +130,3 @@ private: }; #endif // _WX_PEN_H_ -