X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/112c5086e85454b320cdb45f2e16dc5f34e8b9d8..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/gtk/pen.h diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index cbe0cd1ae2..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,7 +27,11 @@ class wxPen; -typedef char wxDash; +#if defined(__WXGTK127__) || defined(__WXGTK20__) +typedef gint8 wxGTKDash; +#else +typedef gchar wxGTKDash; +#endif //----------------------------------------------------------------------------- // wxPen @@ -35,17 +39,21 @@ typedef char wxDash; 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 ); @@ -63,12 +71,13 @@ class wxPen: public wxGDIObject int GetDashes(wxDash **ptr) const; int GetDashCount() const; wxDash* GetDash() const; - - bool Ok() const; - void Unshare(); - - // no data :-) +private: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + + DECLARE_DYNAMIC_CLASS(wxPen) }; #endif // __GTKPENH__