X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..a9e8bf2dd9bccb38eb39fba955125aaf23d6f500:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 800117d71b..fe95ad1003 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/pen.h +// Name: wx/gtk1/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// 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_CORE wxPen; -#if defined(__WXGTK127__) || defined(__WXGTK20__) +#if defined(__WXGTK127__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -37,32 +32,27 @@ 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; } - + 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 +62,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) };