X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eca425d4bc323540de9d5d525f6b2d295d8ed1a..e276acb530f41f0b87c4576c0215201a8a767dff:/include/wx/gtk1/pen.h?ds=sidebyside diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 218116ce8a..97fea928a3 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/gtk1/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,31 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKPENH__ #define __GTKPENH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" -#include - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxPen; - -typedef wxInt8 wxDash; +class WXDLLIMPEXP_FWD_CORE wxPen; -#if GTK_CHECK_VERSION(1,2,7) +#if defined(__WXGTK127__) typedef gint8 wxGTKDash; #else typedef gchar wxGTKDash; @@ -41,39 +32,47 @@ typedef gchar wxGTKDash; // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxPenBase { public: - 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() { } + + 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 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 SetCap( int capStyle ); - void SetJoin( int joinStyle ); - void SetStyle( int style ); + void SetColour( unsigned char red, unsigned char green, unsigned char blue ); + 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 ); - - wxColour &GetColour() const; - int GetCap() const; - int GetJoin() const; - int GetStyle() const; + void SetStipple(const wxBitmap& stipple); + + 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; - - bool Ok() const; + wxBitmap *GetStipple() const; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif - void Unshare(); +private: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -private: DECLARE_DYNAMIC_CLASS(wxPen) };