Corrected some assertions (m_region.m_refData vs. m_refData)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -443,7 +443,7 @@ wxRegionIteratorGeneric wxRegionIteratorGeneric::operator++(int)
|
|||||||
|
|
||||||
wxRect wxRegionIteratorGeneric::GetRect() const
|
wxRect wxRegionIteratorGeneric::GetRect() const
|
||||||
{
|
{
|
||||||
wxASSERT(m_refData);
|
wxASSERT(m_region.m_refData);
|
||||||
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
||||||
wxASSERT(box);
|
wxASSERT(box);
|
||||||
return wxRect
|
return wxRect
|
||||||
@@ -456,7 +456,7 @@ wxRect wxRegionIteratorGeneric::GetRect() const
|
|||||||
|
|
||||||
long wxRegionIteratorGeneric::GetX() const
|
long wxRegionIteratorGeneric::GetX() const
|
||||||
{
|
{
|
||||||
wxASSERT(m_refData);
|
wxASSERT(m_region.m_refData);
|
||||||
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
||||||
wxASSERT(box);
|
wxASSERT(box);
|
||||||
return box->x1;
|
return box->x1;
|
||||||
@@ -464,7 +464,7 @@ long wxRegionIteratorGeneric::GetX() const
|
|||||||
|
|
||||||
long wxRegionIteratorGeneric::GetY() const
|
long wxRegionIteratorGeneric::GetY() const
|
||||||
{
|
{
|
||||||
wxASSERT(m_refData);
|
wxASSERT(m_region.m_refData);
|
||||||
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
||||||
wxASSERT(box);
|
wxASSERT(box);
|
||||||
return box->y1;
|
return box->y1;
|
||||||
@@ -472,7 +472,7 @@ long wxRegionIteratorGeneric::GetY() const
|
|||||||
|
|
||||||
long wxRegionIteratorGeneric::GetW() const
|
long wxRegionIteratorGeneric::GetW() const
|
||||||
{
|
{
|
||||||
wxASSERT(m_refData);
|
wxASSERT(m_region.m_refData);
|
||||||
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
||||||
wxASSERT(box);
|
wxASSERT(box);
|
||||||
return box->x2 - box->x1;
|
return box->x2 - box->x1;
|
||||||
@@ -480,7 +480,7 @@ long wxRegionIteratorGeneric::GetW() const
|
|||||||
|
|
||||||
long wxRegionIteratorGeneric::GetH() const
|
long wxRegionIteratorGeneric::GetH() const
|
||||||
{
|
{
|
||||||
wxASSERT(m_refData);
|
wxASSERT(m_region.m_refData);
|
||||||
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
const Box *box = M_REGIONDATA_OF(m_region)->GetBox(m_current);
|
||||||
wxASSERT(box);
|
wxASSERT(box);
|
||||||
return box->y2 - box->y1;
|
return box->y2 - box->y1;
|
||||||
|
Reference in New Issue
Block a user