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

wxQt! Refactoring only

Browse source
This commit is contained in:
ali kettab 2024-02-18 17:32:15 +01:00
parent f24b3d5483
commit f9c2d24bb6
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/qt/brush.cpp
View file

@ -74,6 +74,15 @@ public:
m_style = data.m_style; m_style = data.m_style;
} }
void DoSetStipple(const wxBitmap& stipple)
{
m_qtBrush.setTexture(*stipple.GetHandle());
if (stipple.GetMask() != nullptr)
m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
else
m_style = wxBRUSHSTYLE_STIPPLE;
}
bool operator == (const wxBrushRefData& data) const bool operator == (const wxBrushRefData& data) const
{ {
return m_qtBrush == data.m_qtBrush; return m_qtBrush == data.m_qtBrush;
@ -113,11 +122,8 @@ wxBrush::wxBrush(const wxColour& col, int style)
wxBrush::wxBrush(const wxBitmap& stipple) wxBrush::wxBrush(const wxBitmap& stipple)
{ {
m_refData = new wxBrushRefData(); m_refData = new wxBrushRefData();
M_BRUSHDATA.setTexture(*stipple.GetHandle());
if (stipple.GetMask() != nullptr) static_cast<wxBrushRefData*>(m_refData)->DoSetStipple(stipple);
M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
else
M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
} }
@ -143,12 +149,8 @@ void wxBrush::SetStyle(wxBrushStyle style)
void wxBrush::SetStipple(const wxBitmap& stipple) void wxBrush::SetStipple(const wxBitmap& stipple)
{ {
AllocExclusive(); AllocExclusive();
M_BRUSHDATA.setTexture(*stipple.GetHandle());
if (stipple.GetMask() != nullptr) static_cast<wxBrushRefData*>(m_refData)->DoSetStipple(stipple);
M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
else
M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
} }