Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allocate wxRegionRefData at all for empty region

Browse Source 
Empty regions don't really need any data.
This commit is contained in:
Jay Nabonne
2019-01-21 12:35:55 +00:00
committed by Vadim Zeitlin
parent 0cd2f7b687
commit 637b861eb1
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qt/region.cpp
View File

@@ -57,7 +57,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
wxRegion::wxRegion() wxRegion::wxRegion()
{ {
m_refData = new wxRegionRefData(); m_refData = NULL;
} }
wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
@@ -133,14 +133,20 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance)
bool wxRegion::IsEmpty() const bool wxRegion::IsEmpty() const
{ {
wxCHECK_MSG( IsOk(), true, "Invalid region" ); if ( IsNull() )
return true;
wxCHECK_MSG(IsOk(), true, "Invalid region" );
return M_REGIONDATA.isEmpty(); return M_REGIONDATA.isEmpty();
} }
void wxRegion::Clear() void wxRegion::Clear()
{ {
wxCHECK_RET( IsOk(), "Invalid region" ); if ( IsNull() )
return;
wxCHECK_RET(IsOk(), "Invalid region" );
AllocExclusive(); AllocExclusive();
M_REGIONDATA = QRegion(); M_REGIONDATA = QRegion();
@@ -171,6 +177,15 @@ bool wxRegion::DoIsEqual(const wxRegion& region) const
bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
{ {
if ( m_refData == NULL )
{
x =
y =
w =
h = 0;
return false;
}
wxCHECK_MSG( IsOk(), false, "Invalid region" ); wxCHECK_MSG( IsOk(), false, "Invalid region" );
QRect bounding = M_REGIONDATA.boundingRect(); QRect bounding = M_REGIONDATA.boundingRect();