X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f53523161202c06e848824c2ec2817cb9878180..f84a986cfc6e512240b77fcdfbacc769b8a0cd02:/include/wx/x11/pen.h diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 86151f9db4..7df09ebc19 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/x11/pen.h // Purpose: wxPen class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PEN_H_ #define _WX_PEN_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "pen.h" -#endif - #include "wx/gdicmn.h" #include "wx/gdiobj.h" @@ -23,9 +19,9 @@ // classes //----------------------------------------------------------------------------- -class wxPen; -class wxColour; -class wxBitmap; +class WXDLLIMPEXP_CORE wxPen; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_CORE wxBitmap; typedef char wxX11Dash; @@ -33,25 +29,23 @@ typedef char wxX11Dash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } - + wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); wxPen( const wxBitmap &stipple, int width ); - ~wxPen(); - - wxPen( const wxPen& pen ) { Ref(pen); } - wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; } - - bool Ok() const { return m_refData != NULL; } - + virtual ~wxPen(); + + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_refData != NULL; } + bool operator == ( const wxPen& pen ) const; bool operator != (const wxPen& pen) const { return !(*this == pen); } void SetColour( const wxColour &colour ); - void SetColour( int red, int green, int blue ); + void SetColour( unsigned char red, unsigned char green, unsigned char blue ); void SetCap( int capStyle ); void SetJoin( int joinStyle ); void SetStyle( int style ); @@ -69,11 +63,11 @@ public: wxDash* GetDash() const; wxBitmap* GetStipple() const; -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxPen) };