From: Gilles Depeyrot Date: Sun, 22 Jul 2001 17:21:59 +0000 (+0000) Subject: post wxUniv merge fix X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f2828b3910f61459110584704eed70cc3aa2501b post wxUniv merge fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp index 125790f178..1d5869b2a3 100644 --- a/samples/richedit/wxlwindow.cpp +++ b/samples/richedit/wxlwindow.cpp @@ -266,7 +266,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) { //WXLO_DEBUG(("selecting at : %d/%d", (int) event.GetX(), (int)event.GetY())); int left, top; - ViewStart(&left, &top); + GetViewStart(&left, &top); wxSize size = GetClientSize(); int xdelta, ydelta; @@ -373,7 +373,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) // Calculate where the top of the visible area is: int x0, y0; - ViewStart(&x0,&y0); + GetViewStart(&x0,&y0); int dx, dy; GetScrollPixelsPerUnit(&dx, &dy); x0 *= dx; y0 *= dy; @@ -793,11 +793,11 @@ wxLayoutWindow::ScrollToCursor(void) int x0,y0,x1,y1, dx, dy; // Calculate where the top of the visible area is: - ViewStart(&x0,&y0); + GetViewStart(&x0,&y0); GetScrollPixelsPerUnit(&dx, &dy); x0 *= dx; y0 *= dy; - WXLO_DEBUG(("ScrollToCursor: ViewStart is %d/%d", x0, y0)); + WXLO_DEBUG(("ScrollToCursor: GetViewStart is %d/%d", x0, y0)); // Get the size of the visible window: GetClientSize(&x1, &y1); @@ -871,7 +871,7 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect) int x0,y0,x1,y1, dx, dy; // Calculate where the top of the visible area is: - ViewStart(&x0,&y0); + GetViewStart(&x0,&y0); GetScrollPixelsPerUnit(&dx, &dy); x0 *= dx; y0 *= dy; @@ -1093,7 +1093,7 @@ wxLayoutWindow::ResizeScrollbars(bool exact) (max.x > size.x - X_SCROLL_PAGE|| max.y > size.y - Y_SCROLL_PAGE) ) { - ViewStart(&m_ViewStartX, &m_ViewStartY); + GetViewStart(&m_ViewStartX, &m_ViewStartY); SetScrollbars(X_SCROLL_PAGE, Y_SCROLL_PAGE, max.x / X_SCROLL_PAGE + 2,