X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..69429a166f8b168228bbb89eb8c52903670f4fd2:/include/wx/gtk1/pen.h?ds=sidebyside diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 508a4e5ea0..3ee44368e2 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -11,7 +11,7 @@ #ifndef __GTKPENH__ #define __GTKPENH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #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 @@ -36,13 +40,20 @@ typedef char wxDash; 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 ); - 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 ); @@ -60,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) };