X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/pen.h diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index 7e6f2c7335..3ee44368e2 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -11,7 +11,7 @@ #ifndef __GTKPENH__ #define __GTKPENH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -27,7 +27,7 @@ class wxPen; -#ifdef __WXGTK127__ +#if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -40,13 +40,20 @@ typedef gchar wxGTKDash; class wxPen: public wxGDIObject { public: - wxPen(); + wxPen() { } + wxPen( const wxColour &colour, int width, int style ); - wxPen( const wxPen& pen ); ~wxPen(); - wxPen& 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; + bool operator != (const wxPen& pen) const { return !(*this == pen); } void SetColour( const wxColour &colour ); void SetColour( int red, int green, int blue ); @@ -64,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) };