introduce wxBrushStyle enum and replace 'int style' occurrences in wxBrush code with 'wxBrushStyle style'; the change is backward compatible and documented in changes.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1993,7 +1993,7 @@ enum
|
||||
|
||||
/* IDs used by generic file dialog (13 consecutive starting from this value) */
|
||||
wxID_FILEDLGG = 5900,
|
||||
|
||||
|
||||
/* IDs used by generic file ctrl (4 consecutive starting from this value) */
|
||||
wxID_FILECTRL = 5950,
|
||||
|
||||
@@ -2100,32 +2100,6 @@ enum
|
||||
wxITALIC,
|
||||
wxSLANT,
|
||||
|
||||
/* Pen styles */
|
||||
wxSOLID = 100,
|
||||
wxDOT,
|
||||
wxLONG_DASH,
|
||||
wxSHORT_DASH,
|
||||
wxDOT_DASH,
|
||||
wxUSER_DASH,
|
||||
|
||||
wxTRANSPARENT,
|
||||
|
||||
/* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */
|
||||
/* Note also that stippling a Pen IS meaningfull, because a Line is */
|
||||
wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */
|
||||
wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */
|
||||
/* drawn with a Pen, and without any Brush -- and it can be stippled. */
|
||||
wxSTIPPLE = 110,
|
||||
|
||||
wxBDIAGONAL_HATCH, /* In wxWidgets < 2.6 use WX_HATCH macro */
|
||||
wxCROSSDIAG_HATCH, /* to verify these wx*_HATCH are in style */
|
||||
wxFDIAGONAL_HATCH, /* of wxBrush. In wxWidgets >= 2.6 use */
|
||||
wxCROSS_HATCH, /* wxBrush::IsHatch() instead. */
|
||||
wxHORIZONTAL_HATCH,
|
||||
wxVERTICAL_HATCH,
|
||||
wxFIRST_HATCH = wxBDIAGONAL_HATCH,
|
||||
wxLAST_HATCH = wxVERTICAL_HATCH,
|
||||
|
||||
wxJOIN_BEVEL = 120,
|
||||
wxJOIN_MITER,
|
||||
wxJOIN_ROUND,
|
||||
@@ -2659,7 +2633,7 @@ typedef HIShapeRef WXHRGN;
|
||||
|
||||
#endif
|
||||
|
||||
#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
|
||||
#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
|
||||
|
||||
/* Definitions of 32-bit/64-bit types
|
||||
* These are typedef'd exactly the same way in newer OS X headers so
|
||||
|
Reference in New Issue
Block a user