X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/mgl/pen.h diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index aaaf0b4221..6dd307ae0c 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.h +// Name: wx/mgl/pen.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 Vaclav Slavik +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // 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,8 +20,8 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxPen; //----------------------------------------------------------------------------- // wxPen @@ -35,24 +30,22 @@ class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen: public wxGDIObject { public: - wxPen(); - wxPen(const wxColour &colour, int width, int style); + wxPen() {} + wxPen(const wxColour &colour, int width = 1, int style = wxSOLID); 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 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); void SetStipple(const wxBitmap& stipple); - + wxColour &GetColour() const; int GetCap() const; int GetJoin() const; @@ -62,15 +55,19 @@ public: int GetDashCount() const; wxDash* GetDash() const; wxBitmap *GetStipple() const; - - bool Ok() const; - void Unshare(); - + bool Ok() const { return IsOk(); } + bool IsOk() const; + // implementation: void* GetPixPattern() const; -private: +protected: + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + +private: DECLARE_DYNAMIC_CLASS(wxPen) };