dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r20459) -Codechange: Remove the Scrollbar members of Window and make NWidgetScrollbar inherit from Scrollbar instead.

Browse Source
This commit is contained in:
frosch
2010-08-12 09:13:04 +00:00
parent 92c34da796
commit b98eba0fb2
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/window.cpp
View File

@@ -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<NWidgetScrollbar>(widnum)->GetScrollbar(this);
return this->GetWidget<NWidgetScrollbar>(widnum);
}
/**
@@ -114,7 +114,7 @@ const Scrollbar *Window::GetScrollbar(uint widnum) const
*/
Scrollbar *Window::GetScrollbar(uint widnum)
{
return this->GetWidget<NWidgetScrollbar>(widnum)->GetScrollbar(this);
return this->GetWidget<NWidgetScrollbar>(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)
{
}