summaryrefslogtreecommitdiff
path: root/src/window_gui.h
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-08-12 08:37:01 +0000
committerfrosch <frosch@openttd.org>2010-08-12 08:37:01 +0000
commit71ca58c2bb1b72a088acec5b70423a43512ec195 (patch)
treeb0e875a8626ce26d7fed7597328409f2cb937dbe /src/window_gui.h
parent10339c60c0e53ccc90f0cc379763be6582d87bf2 (diff)
downloadopenttd-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/window_gui.h')
-rw-r--r--src/window_gui.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window_gui.h b/src/window_gui.h
index 13f61d628..1f51c3aa5 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -382,9 +382,9 @@ public:
int width; ///< width of the window (number of pixels to the right in x direction)
int height; ///< Height of the window (number of pixels down in y direction)
- Scrollbar hscroll; ///< Horizontal scroll bar
- Scrollbar vscroll; ///< First vertical scroll bar
- Scrollbar vscroll2; ///< Second vertical scroll bar
+ Scrollbar old_hscroll; ///< Horizontal scroll bar
+ Scrollbar old_vscroll; ///< First vertical scroll bar
+ Scrollbar old_vscroll2; ///< Second vertical scroll bar
ResizeInfo resize; ///< Resize information
Owner owner; ///< The owner of the content shown in this window. Company colour is acquired from this variable.
@@ -412,7 +412,7 @@ public:
void InitNested(const WindowDesc *desc, WindowNumber number = 0);
void CreateNestedTree(const WindowDesc *desc, bool fill_nested = true);
- void FinishInitNested(const WindowDesc *desc, WindowNumber window_number);
+ void FinishInitNested(const WindowDesc *desc, WindowNumber window_number = 0);
/**
* Sets the enabled/disabled status of a widget.