X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bbe427f8e5a2078b266e282453595b5a634d35c..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/gtk/pen.h diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index fb37103370..e71e01253f 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/gtk/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,7 +11,7 @@ #ifndef __GTKPENH__ #define __GTKPENH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -27,23 +27,33 @@ class wxPen; +#if defined(__WXGTK127__) || defined(__WXGTK20__) +typedef gint8 wxGTKDash; +#else +typedef gchar wxGTKDash; +#endif + //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- class wxPen: public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxPen) - - public: - - wxPen(); - wxPen( const wxColour &colour, int width, int style ); - wxPen( const wxPen& pen ); +public: + wxPen() { } + + wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); ~wxPen(); - wxPen& operator = ( const wxPen& pen ); - bool operator == ( const wxPen& pen ); - bool operator != ( const wxPen& pen ); + + wxPen( const wxPen& pen ) + : wxGDIObject() + { 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 ); @@ -51,16 +61,23 @@ class wxPen: public wxGDIObject 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; int GetStyle() const; int GetWidth() const; - bool Ok() const; - - void Unshare(); + int GetDashes(wxDash **ptr) const; + int GetDashCount() const; + wxDash* GetDash() const; - // no data :-) +private: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + + DECLARE_DYNAMIC_CLASS(wxPen) }; #endif // __GTKPENH__