diff options
author | alberth <alberth@openttd.org> | 2009-11-20 20:10:06 +0000 |
---|---|---|
committer | alberth <alberth@openttd.org> | 2009-11-20 20:10:06 +0000 |
commit | 777d5ce12eaf60389746245f3e3ceae408afc17e (patch) | |
tree | 6cd2b30b16b1156dbce5f6814cbb6f63be98c14b /src/window.cpp | |
parent | e166d5b4028432b5f16234b2ae1d045f5fafe3a8 (diff) | |
download | openttd-777d5ce12eaf60389746245f3e3ceae408afc17e.tar.xz |
(svn r18201) -Codechange (r18092): No need anymore for initializing nested widgets for Widget* arrays.
Diffstat (limited to 'src/window.cpp')
-rw-r--r-- | src/window.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window.cpp b/src/window.cpp index 72e678f93..df7c5e50b 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -498,7 +498,7 @@ void Window::ReInit(int rx, int ry) /* Re-initialize the window from the ground up. No need to change the nested_array, as all widgets stay where they are. */ this->nested_root->SetupSmallestSize(this, false); - this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, false, false, _dynlang.text_dir == TD_RTL); + this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, _dynlang.text_dir == TD_RTL); this->width = this->nested_root->smallest_x; this->height = this->nested_root->smallest_y; this->resize.width = this->nested_root->smallest_x; @@ -784,7 +784,7 @@ void Window::InitializeData(WindowClass cls, int window_number, uint32 desc_flag this->nested_root->SetupSmallestSize(this, false); } /* Initialize to smallest size. */ - this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, false, false, _dynlang.text_dir == TD_RTL); + this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, _dynlang.text_dir == TD_RTL); /* Further set up window properties, * this->left, this->top, this->width, this->height, this->resize.width, and this->resize.height are initialized later. */ @@ -1357,7 +1357,7 @@ void ResizeWindow(Window *w, int delta_x, int delta_y) assert(w->nested_root->resize_x == 0 || new_xinc % w->nested_root->resize_x == 0); assert(w->nested_root->resize_y == 0 || new_yinc % w->nested_root->resize_y == 0); - w->nested_root->AssignSizePosition(ST_RESIZE, 0, 0, w->nested_root->smallest_x + new_xinc, w->nested_root->smallest_y + new_yinc, false, false, _dynlang.text_dir == TD_RTL); + w->nested_root->AssignSizePosition(ST_RESIZE, 0, 0, w->nested_root->smallest_x + new_xinc, w->nested_root->smallest_y + new_yinc, _dynlang.text_dir == TD_RTL); w->width = w->nested_root->current_x; w->height = w->nested_root->current_y; w->SetDirty(); |