X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/mgl/pen.h diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index 3b69b3d054..6dd307ae0c 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_PEN_H__ #define __WX_PEN_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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 @@ -38,21 +33,19 @@ public: 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,8 +55,9 @@ public: int GetDashCount() const; wxDash* GetDash() const; wxBitmap *GetStipple() const; - - bool Ok() const; + + bool Ok() const { return IsOk(); } + bool IsOk() const; // implementation: void* GetPixPattern() const; @@ -73,7 +67,7 @@ protected: virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; -private: +private: DECLARE_DYNAMIC_CLASS(wxPen) };