X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index ccb8369703..f196a8165d 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/pen.h +// Name: wx/gtk1/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -20,9 +20,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; -#if defined(__WXGTK127__) || defined(__WXGTK20__) +#if defined(__WXGTK127__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -36,28 +36,24 @@ class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } - + wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); - ~wxPen(); - - wxPen( const wxPen& pen ) - : wxGDIObject() - { 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 ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); - + wxColour &GetColour() const; int GetCap() const; int GetJoin() const; @@ -67,11 +63,11 @@ public: int GetDashCount() const; wxDash* GetDash() const; -private: +private: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxPen) };