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

Default ctor should create uninitialised wxPen too in wxQt as documented

Browse source
This commit is contained in:
ali kettab 2023-09-09 22:27:47 +01:00
parent 49b2f9c809
commit c028f61d0f
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/qt/dc.cpp
View file

@ -178,6 +178,8 @@ void wxQtDCImpl::SetPen(const wxPen& pen)
{
m_pen = pen;
if ( !m_pen.IsOk() ) return;
m_qtPainter->setPen(pen.GetHandle());
ApplyRasterColourOp();

15
src/qt/pen.cpp
View file

@ -241,7 +241,6 @@ class wxPenRefData: public wxGDIRefData
wxPen::wxPen()
{
m_refData = new wxPenRefData();
}
wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style)
@ -334,6 +333,8 @@ void wxPen::SetCap(wxPenCap cap)
wxColour wxPen::GetColour() const
{
wxCHECK_MSG( IsOk(), wxNullColour, "invalid pen" );
wxColour c(M_PENDATA.color());
return c;
}
@ -345,33 +346,43 @@ wxBitmap *wxPen::GetStipple() const
wxPenStyle wxPen::GetStyle() const
{
wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, "invalid pen" );
return ConvertPenStyle(M_PENDATA.style());
}
wxPenJoin wxPen::GetJoin() const
{
wxCHECK_MSG( IsOk(), wxJOIN_INVALID, "invalid pen" );
return ConvertPenJoinStyle(M_PENDATA.joinStyle());
}
wxPenCap wxPen::GetCap() const
{
wxCHECK_MSG( IsOk(), wxCAP_INVALID, "invalid pen" );
return ConvertPenCapStyle(M_PENDATA.capStyle());
}
int wxPen::GetWidth() const
{
wxCHECK_MSG( IsOk(), -1, "invalid pen" );
return M_PENDATA.width();
}
int wxPen::GetDashes(wxDash **ptr) const
{
wxCHECK_MSG( IsOk(), -1, "invalid pen" );
*ptr = (wxDash *)((wxPenRefData *)m_refData)->m_dashes;
return ((wxPenRefData *)m_refData)->m_dashesSize;
}
QPen wxPen::GetHandle() const
{
return M_PENDATA;
return IsOk() ? M_PENDATA : QPen();
}
wxGDIRefData *wxPen::CreateGDIRefData() const