X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eca425d4bc323540de9d5d525f6b2d295d8ed1a..034e3041693f90324cfa4d282ef44e6063738d83:/include/wx/gtk/pen.h diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 218116ce8a..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 @@ -21,17 +21,13 @@ #include "wx/gdiobj.h" #include "wx/gdicmn.h" -#include - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxPen; -typedef wxInt8 wxDash; - -#if GTK_CHECK_VERSION(1,2,7) +#if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -44,13 +40,20 @@ typedef gchar wxGTKDash; class wxPen: public wxGDIObject { public: - wxPen(); - wxPen( const wxColour &colour, int width, int style ); - wxPen( const wxPen& pen ); + 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 ); @@ -68,12 +71,12 @@ public: int GetDashes(wxDash **ptr) const; int GetDashCount() const; wxDash* GetDash() const; - - bool Ok() const; - - void Unshare(); private: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + DECLARE_DYNAMIC_CLASS(wxPen) };