X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52750c2e106113bc8d1c46289474adfd405d5ade..8ba01d3546ba25eee6f2990fbc7cddbef9ef4e41:/include/wx/mgl/pen.h diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index d6e5f02d1d..6454bee1b2 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/mgl/pen.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_PEN_H__ #define __WX_PEN_H__ -#ifdef __GNUG__ -#pragma interface "pen.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,55 +20,59 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxPen; //----------------------------------------------------------------------------- // wxPen //----------------------------------------------------------------------------- -class WXDLLEXPORT wxPen: public wxGDIObject +class WXDLLIMPEXP_CORE wxPen : public wxPenBase { public: wxPen() {} - wxPen(const wxColour &colour, int width, int style); + 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 + wxPen(const wxBitmap& stipple, int width); - wxPen(const wxPen& pen); - ~wxPen() {} - wxPen& operator = (const wxPen& pen); + virtual ~wxPen() {} bool operator == (const wxPen& pen) const; bool operator != (const wxPen& pen) const; 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); 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; - - bool Ok() const; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxPenStyle)style); } +#endif // implementation: void* GetPixPattern() const; 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; -private: +private: DECLARE_DYNAMIC_CLASS(wxPen) };