@@ -459,9 +459,8 @@ namespace Rtt
459
459
460
460
void SolarAppContext::Flush ()
461
461
{
462
- fCanvas ->Refresh (false );
463
- fCanvas ->Update ();
464
462
fRuntime ->GetDisplay ().Invalidate ();
463
+ fCanvas ->Refresh (false );
465
464
}
466
465
467
466
void SolarAppContext::Pause ()
@@ -853,8 +852,7 @@ void SolarFrame::ResetSize()
853
852
}
854
853
855
854
ChangeSize (fContext ->GetRuntimeDelegate ()->fContentWidth , fContext ->GetRuntimeDelegate ()->fContentHeight );
856
- Refresh (false );
857
- Update ();
855
+ GetCanvas ()->Refresh (false );
858
856
}
859
857
860
858
void SolarFrame::CreateMenus ()
@@ -1345,8 +1343,7 @@ void SolarFrame::OnZoomIn(wxCommandEvent &event)
1345
1343
frame->GetContext ()->GetRuntimeDelegate ()->fContentHeight = proposedHeight;
1346
1344
frame->ChangeSize (proposedWidth, proposedHeight);
1347
1345
frame->GetContext ()->RestartRenderer ();
1348
- frame->Refresh (false );
1349
- frame->Update ();
1346
+ GetCanvas ()->Refresh (false );
1350
1347
1351
1348
LinuxSimulatorView::Config::zoomedWidth = proposedWidth;
1352
1349
LinuxSimulatorView::Config::zoomedHeight = proposedHeight;
@@ -1374,8 +1371,7 @@ void SolarFrame::OnZoomOut(wxCommandEvent &event)
1374
1371
frame->GetContext ()->GetRuntimeDelegate ()->fContentHeight = proposedHeight;
1375
1372
frame->ChangeSize (proposedWidth, proposedHeight);
1376
1373
frame->GetContext ()->RestartRenderer ();
1377
- frame->Refresh (false );
1378
- frame->Update ();
1374
+ GetCanvas ()->Refresh (false );
1379
1375
1380
1376
LinuxSimulatorView::Config::zoomedWidth = proposedWidth;
1381
1377
LinuxSimulatorView::Config::zoomedHeight = proposedHeight;
@@ -1570,18 +1566,9 @@ void SolarGLCanvas::OnWindowCreate(wxWindowCreateEvent &event)
1570
1566
{
1571
1567
// SetCurrent() must have an active window created before being called, making this hte perfect place to do it.
1572
1568
Rtt_ASSERT (fGLContext );
1573
-
1574
1569
// the current context must be set before we get OGL pointers
1575
1570
SetCurrent (*fGLContext );
1576
-
1577
- if (fContext && fContext ->GetRuntime ())
1578
- {
1579
- fContext ->GetRuntime ()->GetDisplay ().Invalidate ();
1580
- }
1581
-
1582
- // generate paint event
1583
1571
Refresh (false );
1584
- Update ();
1585
1572
}
1586
1573
1587
1574
void SolarGLCanvas::OnSize (wxSizeEvent &event)
@@ -1596,12 +1583,5 @@ void SolarGLCanvas::OnSize(wxSizeEvent &event)
1596
1583
1597
1584
fWindowHeight = event.GetSize ().y ;
1598
1585
1599
- if (fContext && fContext ->GetRuntime ())
1600
- {
1601
- fContext ->GetRuntime ()->GetDisplay ().Invalidate ();
1602
- }
1603
-
1604
- // generate a paint event
1605
1586
Refresh (false );
1606
- Update ();
1607
1587
}
0 commit comments