add convenient GetViewStart() and Scroll() overloads taking wxPoint instead of 2 int[ pointer]s

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-24 15:11:00 +00:00
parent 9675a49d4e
commit 0b0f6f87d5
6 changed files with 44 additions and 36 deletions

View File

@@ -493,10 +493,7 @@ private:
{
m_inDoSync = true;
int x, y;
GetViewStart(&x, &y);
m_winSync->Scroll(x, y);
m_winSync->Scroll(GetViewStart());
m_inDoSync = false;
}
@@ -771,9 +768,7 @@ void MyCanvas::OnScrollWin( wxCommandEvent &WXUNUSED(event) )
{
wxLogMessage("Scrolling 2 units up.\n"
"The white square and the controls should move equally!");
int x,y;
GetViewStart( &x, &y );
Scroll( wxDefaultCoord, y+2 );
Scroll( wxDefaultCoord, GetViewStart().y+2 );
}
// ----------------------------------------------------------------------------
@@ -1059,20 +1054,14 @@ MyAutoScrollingWindow::DeviceCoordsToGraphicalChars(wxPoint pos) const
{
pos.x /= m_fontW;
pos.y /= m_fontH;
int vX, vY;
GetViewStart(&vX, &vY);
pos.x += vX;
pos.y += vY;
pos += GetViewStart();
return pos;
}
wxPoint
MyAutoScrollingWindow::GraphicalCharToDeviceCoords(wxPoint pos) const
{
int vX, vY;
GetViewStart(&vX, &vY);
pos.x -= vX;
pos.y -= vY;
pos -= GetViewStart();
pos.x *= m_fontW;
pos.y *= m_fontH;
return pos;