X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/pen.h?ds=inline diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index f7df079622..b273d2c6df 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -7,31 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GTK_PEN_H_ +#define _WX_GTK_PEN_H_ -#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" #include "wx/gdiobj.h" #include "wx/gdicmn.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen; - -#if defined(__WXGTK127__) || defined(__WXGTK20__) typedef gint8 wxGTKDash; -#else -typedef gchar wxGTKDash; -#endif //----------------------------------------------------------------------------- // wxPen @@ -41,28 +23,24 @@ 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,12 +50,12 @@ public: int GetDashCount() const; wxDash* GetDash() const; -private: +protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxPen) }; -#endif // __GTKPENH__ +#endif // _WX_GTK_PEN_H_