X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52750c2e106113bc8d1c46289474adfd405d5ade..e4c37d10dd8f5aa28de2afd022b49a3f53a86d47:/include/wx/mgl/pen.h diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index d6e5f02d1d..1bedb8ace5 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" @@ -36,7 +31,7 @@ class WXDLLEXPORT wxPen: public wxGDIObject { public: wxPen() {} - wxPen(const wxColour &colour, int width, int style); + wxPen(const wxColour &colour, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); wxPen(const wxPen& pen); ~wxPen() {} @@ -45,14 +40,14 @@ public: 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,7 +57,7 @@ public: int GetDashCount() const; wxDash* GetDash() const; wxBitmap *GetStipple() const; - + bool Ok() const; // implementation: @@ -73,7 +68,7 @@ protected: virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; -private: +private: DECLARE_DYNAMIC_CLASS(wxPen) };