X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index e71e01253f..f196a8165d 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/pen.h +// Name: wx/gtk1/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKPENH__ #define __GTKPENH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,9 +20,9 @@ // classes //----------------------------------------------------------------------------- -class wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; -#if defined(__WXGTK127__) || defined(__WXGTK20__) +#if defined(__WXGTK127__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -37,32 +32,28 @@ typedef gchar wxGTKDash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxGDIObject { public: wxPen() { } - + wxPen( const wxColour &colour, int width = 1, int style = wxSOLID ); - ~wxPen(); - - wxPen( const wxPen& pen ) - : wxGDIObject() - { Ref(pen); } - wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; } - - bool Ok() const { return m_refData != NULL; } - + virtual ~wxPen(); + + bool Ok() const { return IsOk(); } + bool IsOk() 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 ); + void SetColour( unsigned char red, unsigned char green, unsigned char blue ); void SetCap( int capStyle ); 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; @@ -72,11 +63,11 @@ public: int GetDashCount() const; wxDash* GetDash() const; -private: +private: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxPen) };