From 6e9c9c28d950a822beb0fb4e76d5ba40a247085c Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 12 Aug 2010 09:13:04 +0000 Subject: (svn r20459) -Codechange: Remove the Scrollbar members of Window and make NWidgetScrollbar inherit from Scrollbar instead. --- src/window.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/window.cpp') diff --git a/src/window.cpp b/src/window.cpp index 469e0c26b..09134b270 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -104,7 +104,7 @@ int Window::GetRowFromWidget(int clickpos, int widget, int padding, int line_hei */ const Scrollbar *Window::GetScrollbar(uint widnum) const { - return this->GetWidget(widnum)->GetScrollbar(this); + return this->GetWidget(widnum); } /** @@ -114,7 +114,7 @@ const Scrollbar *Window::GetScrollbar(uint widnum) const */ Scrollbar *Window::GetScrollbar(uint widnum) { - return this->GetWidget(widnum)->GetScrollbar(this); + return this->GetWidget(widnum); } @@ -1304,7 +1304,7 @@ void Window::InitNested(const WindowDesc *desc, WindowNumber window_number) } /** Empty constructor, initialization has been moved to #InitNested() called from the constructor of the derived class. */ -Window::Window() : old_hscroll(false), old_vscroll(true), old_vscroll2(true), scrolling_scrollbar(-1) +Window::Window() : scrolling_scrollbar(-1) { } -- cgit v1.2.3-54-g00ecf