X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74dc5eb60e80a9b2ceddd78cb577f42e48f5b3ba..e4277538a535d6d6c049f0b0ead9ed2b07cd93f2:/include/wx/x11/pen.h?ds=inline diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index 46d954158f..17c2288831 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -1,30 +1,27 @@ ///////////////////////////////////////////////////////////////////////////// -// 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_ -#ifdef __GNUG__ -#pragma interface "pen.h" -#endif - +#include "wx/gdicmn.h" #include "wx/gdiobj.h" -#include "wx/colour.h" -#include "wx/bitmap.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxPen; +class WXDLLIMPEXP_CORE wxPen; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_CORE wxBitmap; typedef char wxX11Dash; @@ -32,30 +29,29 @@ typedef char wxX11Dash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } - - wxPen( const wxColour &colour, int width, int style ); + + 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; } - + 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 ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); - + void SetStipple( wxBitmap *stipple ); + wxColour &GetColour() const; int GetCap() const; int GetJoin() const; @@ -64,12 +60,13 @@ public: int GetDashes(wxDash **ptr) const; int GetDashCount() const; 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) };