Extract wxPenInfoBase in a separate header

This allows to avoid dependency of wx/graphics.h on wx/pen.h.
This commit is contained in:
Vadim Zeitlin
2017-09-10 01:20:22 +02:00
parent cc14a80501
commit a156d5fa40
15 changed files with 170 additions and 133 deletions

View File

@@ -26,6 +26,7 @@
#include "wx/dcmemory.h"
#include "wx/dcprint.h"
#include "wx/math.h"
#include "wx/pen.h"
#include "wx/region.h"
#include "wx/log.h"
#endif
@@ -116,6 +117,21 @@ WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
/* static */
wxGraphicsPenInfo wxGraphicsPenInfo::CreateFromPen(const wxPen& pen)
{
wxDash *dashes;
int nb_dashes = pen.GetDashes(&dashes);
return wxGraphicsPenInfo()
.Colour(pen.GetColour())
.Width(pen.GetWidth())
.Style(pen.GetStyle())
.Stipple(*pen.GetStipple())
.Dashes(nb_dashes, dashes)
.Join(pen.GetJoin())
.Cap(pen.GetCap());
}
//-----------------------------------------------------------------------------
// matrix
//-----------------------------------------------------------------------------