X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ee05f92add0ab92ce08ecb827e3be41336aa06..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/pen.h?ds=sidebyside diff --git a/include/wx/pen.h b/include/wx/pen.h index 341530ef16..36c2bd1f7a 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -15,21 +15,9 @@ #include "wx/gdiobj.h" #include "wx/gdicmn.h" -#if WXWIN_COMPATIBILITY_2_8 -#include "wx/brush.h" // needed for some deprecated declarations -#endif - enum wxPenStyle { -#if WXWIN_COMPATIBILITY_2_8 - /* start of deprecated values */ - /* wxSOLID, wxTRANSPARENT, wxSTIPPLE are already defined in wxBrushStyle */ - wxDOT = 101, - wxLONG_DASH = 102, - wxSHORT_DASH = 103, - wxDOT_DASH = 104, - wxUSER_DASH = 105, - /* end of deprecated values */ + wxPENSTYLE_INVALID = -1, wxPENSTYLE_SOLID = wxSOLID, wxPENSTYLE_DOT = wxDOT, @@ -52,45 +40,7 @@ enum wxPenStyle wxPENSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH, wxPENSTYLE_FIRST_HATCH = wxFIRST_HATCH, - wxPENSTYLE_LAST_HATCH = wxLAST_HATCH, - - wxPENSTYLE_MAX -#else - wxPENSTYLE_SOLID, - wxPENSTYLE_DOT, - wxPENSTYLE_LONG_DASH, - wxPENSTYLE_SHORT_DASH, - wxPENSTYLE_DOT_DASH, - wxPENSTYLE_USER_DASH, - - wxPENSTYLE_TRANSPARENT, - - /* Pen Stippling. */ - wxPENSTYLE_STIPPLE_MASK_OPAQUE, - /* mask is used for blitting monochrome using text fore and back ground colors */ - - wxPENSTYLE_STIPPLE_MASK, - /* mask is used for masking areas in the stipple bitmap (TO DO) */ - - wxPENSTYLE_STIPPLE, - /* drawn with a Pen, and without any Brush -- and it can be stippled. */ - - /* In wxWidgets < 2.6 use WX_HATCH macro */ - /* to verify these wx*_HATCH are in style */ - /* of wxBrush. In wxWidgets >= 2.6 use */ - /* wxBrush::IsHatch() instead. */ - wxPENSTYLE_BDIAGONAL_HATCH, - wxPENSTYLE_CROSSDIAG_HATCH, - wxPENSTYLE_FDIAGONAL_HATCH, - wxPENSTYLE_CROSS_HATCH, - wxPENSTYLE_HORIZONTAL_HATCH, - wxPENSTYLE_VERTICAL_HATCH, - - wxPENSTYLE_FIRST_HATCH = wxPENSTYLE_BDIAGONAL_HATCH, - wxPENSTYLE_LAST_HATCH = wxPENSTYLE_VERTICAL_HATCH, - - wxPENSTYLE_MAX -#endif + wxPENSTYLE_LAST_HATCH = wxLAST_HATCH }; enum wxPenJoin @@ -99,7 +49,7 @@ enum wxPenJoin wxJOIN_BEVEL = 120, wxJOIN_MITER, - wxJOIN_ROUND, + wxJOIN_ROUND }; enum wxPenCap @@ -112,7 +62,7 @@ enum wxPenCap }; -class WXDLLEXPORT wxPenBase : public wxGDIObject +class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject { public: virtual ~wxPenBase() { } @@ -127,7 +77,7 @@ public: virtual void SetJoin(wxPenJoin join) = 0; virtual void SetCap(wxPenCap cap) = 0; - virtual wxColour& GetColour() const = 0; + virtual wxColour GetColour() const = 0; virtual wxBitmap *GetStipple() const = 0; virtual wxPenStyle GetStyle() const = 0; virtual wxPenJoin GetJoin() const = 0; @@ -135,8 +85,8 @@ public: virtual int GetWidth() const = 0; virtual int GetDashes(wxDash **ptr) const = 0; -#if WXWIN_COMPATIBILITY_2_8 - void SetStyle(wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) { SetStyle((wxPenStyle)style); } #endif }; @@ -166,14 +116,40 @@ public: class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase { public: - wxPen *FindOrCreatePen(const wxColour& colour, int width, wxPenStyle style); + wxPen *FindOrCreatePen(const wxColour& colour, + int width = 1, + wxPenStyle style = wxPENSTYLE_SOLID); + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) + { return FindOrCreatePen(colour, width, (wxPenStyle)style); } +#endif #if WXWIN_COMPATIBILITY_2_6 wxDEPRECATED( void AddPen(wxPen*) ); wxDEPRECATED( void RemovePen(wxPen*) ); #endif }; -extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList; +extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; -#endif - // _WX_PEN_H_BASE_ +// provide comparison operators to allow code such as +// +// if ( pen.GetStyle() == wxTRANSPARENT ) +// +// to compile without warnings which it would otherwise provoke from some +// compilers as it compares elements of different enums +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + +inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t) +{ + return wx_static_cast(int, s) == wx_static_cast(int, t); +} + +inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t) +{ + return !(s == t); +} + +#endif // FUTURE_WXWIN_COMPATIBILITY_3_0 + +#endif // _WX_PEN_H_BASE_