X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/pen.h?ds=sidebyside diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index eb26d53b80..2437073efb 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -7,68 +7,59 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKPENH__ -#define __GTKPENH__ +#ifndef _WX_GTK_PEN_H_ +#define _WX_GTK_PEN_H_ -#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; - -typedef gint8 wxGTKDash; +typedef signed char wxGTKDash; //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxPenBase { 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; } + wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); +#endif - bool Ok() const { return m_refData != NULL; } + virtual ~wxPen(); - bool operator == ( const wxPen& pen ) const; - bool operator != (const wxPen& pen) const { return !(*this == pen); } + bool operator==(const wxPen& pen) const; + bool operator!=(const wxPen& pen) const { return !(*this == pen); } void SetColour( const wxColour &colour ); void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( int capStyle ); - void SetJoin( int joinStyle ); - void SetStyle( int style ); + void SetCap( wxPenCap capStyle ); + void SetJoin( wxPenJoin joinStyle ); + void SetStyle( wxPenStyle style ); void SetWidth( int width ); void SetDashes( int number_of_dashes, const wxDash *dash ); + void SetStipple(const wxBitmap& stipple); - wxColour &GetColour() const; - int GetCap() const; - int GetJoin() const; - int GetStyle() const; + wxColour GetColour() const; + wxPenCap GetCap() const; + wxPenJoin GetJoin() const; + wxPenStyle GetStyle() const; int GetWidth() const; int GetDashes(wxDash **ptr) const; int GetDashCount() const; wxDash* GetDash() const; + wxBitmap *GetStipple() const; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxPen) }; -#endif // __GTKPENH__ +#endif // _WX_GTK_PEN_H_