Simplify WaitForPaint::YieldUntilPainted()
Don't return anything from it, just warn directly -- this is what all the existing callers did, so it's simpler if the function just does it itself instead of forcing them to check its return value. Also reset m_painted after yielding, so that YieldUntilPainted() could be called again, if necessary.
This commit is contained in:
parent
e0a927af94
commit
4da635e2dc
@ -122,10 +122,7 @@ GridTestCase::GridTestCase()
|
||||
m_grid->Refresh();
|
||||
m_grid->Update();
|
||||
|
||||
if ( !waitForPaint.YieldUntilPainted() )
|
||||
{
|
||||
WARN("Grid not repainted until timeout expiration");
|
||||
}
|
||||
waitForPaint.YieldUntilPainted();
|
||||
}
|
||||
|
||||
GridTestCase::~GridTestCase()
|
||||
|
@ -29,8 +29,8 @@ public:
|
||||
}
|
||||
|
||||
// This function waits up to the given number of milliseconds for the paint
|
||||
// event to come and returns true if we did get it or false otherwise.
|
||||
bool YieldUntilPainted(int timeoutInMS = 250) const
|
||||
// event to come and logs a warning if we didn't get it.
|
||||
void YieldUntilPainted(int timeoutInMS = 250)
|
||||
{
|
||||
wxStopWatch sw;
|
||||
for ( ;; )
|
||||
@ -38,10 +38,17 @@ public:
|
||||
wxYield();
|
||||
|
||||
if ( m_painted )
|
||||
return true;
|
||||
{
|
||||
// Reset it in case YieldUntilPainted() is called again.
|
||||
m_painted = false;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( sw.Time() > timeoutInMS )
|
||||
return false;
|
||||
{
|
||||
WARN("Didn't get a paint event until timeout expiration");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -85,9 +92,8 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
bool YieldUntilPainted(int WXUNUSED(timeoutInMS) = 250) const
|
||||
void YieldUntilPainted(int WXUNUSED(timeoutInMS) = 250)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -98,10 +98,7 @@ TEST_CASE("wxWindow::MovePreservesSize", "[window][size][move]")
|
||||
|
||||
w->Show();
|
||||
|
||||
if ( !waitForPaint.YieldUntilPainted() )
|
||||
{
|
||||
WARN("Didn't get a paint event until timeout expiration");
|
||||
}
|
||||
waitForPaint.YieldUntilPainted();
|
||||
|
||||
const wxRect rectOrig = w->GetRect();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user