X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk1/pen.h diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 10ccf5e962..724b9b7920 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/gtk1/pen.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKPENH__ #define __GTKPENH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,43 +20,60 @@ // classes //----------------------------------------------------------------------------- -class wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; + +#if defined(__WXGTK127__) +typedef signed char wxGTKDash; +#else +typedef char wxGTKDash; +#endif //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- -class wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen: public wxPenBase { - DECLARE_DYNAMIC_CLASS(wxPen) +public: + 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); } - public: - - wxPen(void); - wxPen( const wxColour &colour, int width, int style ); - wxPen( const wxPen& pen ); - wxPen( const wxPen* pen ); - ~wxPen(void); - wxPen& operator = ( const wxPen& pen ); - bool operator == ( const wxPen& pen ); - bool operator != ( const wxPen& 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 ); - wxColour &GetColour(void) const; - int GetCap(void) const; - int GetJoin(void) const; - int GetStyle(void) const; - int GetWidth(void) const; - bool Ok(void) const; - - void Unshare(void); - - // no data :-) + void SetDashes( int number_of_dashes, const wxDash *dash ); + 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; + wxBitmap *GetStipple() const; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif + +private: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + + DECLARE_DYNAMIC_CLASS(wxPen) }; #endif // __GTKPENH__