solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Added ctor taking a wxPenInfo to wxPen in wxQt

Browse source
This commit is contained in:
ali kettab 2023-09-09 23:00:43 +01:00
parent c028f61d0f
commit a38774206d
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wx/qt/pen.h
View file

@ -17,6 +17,8 @@ public:
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
wxPen( const wxPenInfo& info );
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
wxPen(const wxColour& col, int width, int style);

33
src/qt/pen.cpp
View file

@ -225,9 +225,36 @@ class wxPenRefData: public wxGDIRefData
defaultPen();
}
wxPenRefData(const wxPenInfo& info)
{
m_qtPen.setWidth(info.GetWidth());
m_qtPen.setStyle(ConvertPenStyle(info.GetStyle()));
m_qtPen.setCapStyle(ConvertPenCapStyle(info.GetCap()));
m_qtPen.setJoinStyle(ConvertPenJoinStyle(info.GetJoin()));
m_qtPen.setColor(info.GetColour().GetQColor());
m_dashesSize = info.GetDashes(const_cast<wxDash**>(&m_dashes));
}
bool operator == (const wxPenRefData& data) const
{
return m_qtPen == data.m_qtPen;
if ( m_dashesSize != data.m_dashesSize )
return false;
if ( m_dashes )
{
if ( !data.m_dashes ||
memcmp(m_dashes, data.m_dashes, m_dashesSize*sizeof(wxDash)) )
{
return false;
}
}
else if ( data.m_dashes )
{
return false;
}
return m_qtPen == data.m_qtPen;
}
QPen m_qtPen;
@ -259,6 +286,10 @@ wxPen::wxPen(const wxColour& col, int width, int style)
M_PENDATA.setColor(col.GetQColor());
}
wxPen::wxPen(const wxPenInfo& info)
{
m_refData = new wxPenRefData(info);
}
bool wxPen::operator==(const wxPen& pen) const
{