diff options
| author | frosch <frosch@openttd.org> | 2010-08-12 08:37:01 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-08-12 08:37:01 +0000 |
| commit | 71ca58c2bb1b72a088acec5b70423a43512ec195 (patch) | |
| tree | b0e875a8626ce26d7fed7597328409f2cb937dbe /src/widget.cpp | |
| parent | 10339c60c0e53ccc90f0cc379763be6582d87bf2 (diff) | |
| download | openttd-71ca58c2bb1b72a088acec5b70423a43512ec195.tar.xz | |
(svn r20453) -Codechange: Remove direct accesses to Window::hscroll, vscroll and vscroll2.
Note: All windows get individual members with the same names, which are initialised via Window::GetScrollbar(). This caching is not required at all, but simplifies conversion.
Diffstat (limited to 'src/widget.cpp')
| -rw-r--r-- | src/widget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index 6b58ff9fb..f188e3365 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -83,7 +83,7 @@ static void ScrollbarClickPositioning(Window *w, WidgetType wtp, int x, int y, i w->flags4 &= ~WF_HSCROLL; w->flags4 &= ~WF_SCROLL2; pos = y; - sb = &w->vscroll; + sb = &w->old_vscroll; break; case WWT_SCROLL2BAR: @@ -91,7 +91,7 @@ static void ScrollbarClickPositioning(Window *w, WidgetType wtp, int x, int y, i w->flags4 &= ~WF_HSCROLL; w->flags4 |= WF_SCROLL2; pos = y; - sb = &w->vscroll2; + sb = &w->old_vscroll2; break; case WWT_HSCROLLBAR: @@ -99,7 +99,7 @@ static void ScrollbarClickPositioning(Window *w, WidgetType wtp, int x, int y, i w->flags4 &= ~WF_SCROLL2; w->flags4 |= WF_HSCROLL; pos = x; - sb = &w->hscroll; + sb = &w->old_hscroll; rtl = _dynlang.text_dir == TD_RTL; break; @@ -1997,14 +1997,14 @@ void NWidgetLeaf::Draw(const Window *w) assert(this->widget_data == 0); DrawVerticalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_UP, (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_MIDDLE, - (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN, &w->vscroll); + (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN, &w->old_vscroll); break; case WWT_SCROLL2BAR: assert(this->widget_data == 0); DrawVerticalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_UP | WF_SCROLL2), (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_MIDDLE | WF_SCROLL2), - (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2), &w->vscroll2); + (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2), &w->old_vscroll2); break; case WWT_CAPTION: @@ -2016,7 +2016,7 @@ void NWidgetLeaf::Draw(const Window *w) assert(this->widget_data == 0); DrawHorizontalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL)) == (WF_SCROLL_UP | WF_HSCROLL), (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL)) == (WF_SCROLL_MIDDLE | WF_HSCROLL), - (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL), &w->hscroll); + (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL), &w->old_hscroll); break; case WWT_SHADEBOX: |