diff options
author | truebrain <truebrain@openttd.org> | 2011-12-15 19:54:23 +0000 |
---|---|---|
committer | truebrain <truebrain@openttd.org> | 2011-12-15 19:54:23 +0000 |
commit | df0afdf0dca6b3d4f621248ada2aed73d7481c66 (patch) | |
tree | fe5b1ab9e0e996c53e17d2eb82442b1829e89cbc /src/widget.cpp | |
parent | 2ecbe895093f91bfdecbd8ab29d0641c2fd9a0f3 (diff) | |
download | openttd-df0afdf0dca6b3d4f621248ada2aed73d7481c66.tar.xz |
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
Diffstat (limited to 'src/widget.cpp')
-rw-r--r-- | src/widget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index ba8c7ebf3..ad8b18064 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -567,7 +567,7 @@ void Window::DrawWidgets() const { this->nested_root->Draw(this); - if (this->flags4 & WF_WHITE_BORDER_MASK) { + if (this->flags & WF_WHITE_BORDER) { DrawFrameRect(0, 0, this->width - 1, this->height - 1, COLOUR_WHITE, FR_BORDERONLY); } } @@ -2341,12 +2341,12 @@ void NWidgetLeaf::Draw(const Window *w) case WWT_STICKYBOX: assert(this->widget_data == 0); - DrawStickyBox(r, this->colour, !!(w->flags4 & WF_STICKY)); + DrawStickyBox(r, this->colour, !!(w->flags & WF_STICKY)); break; case WWT_RESIZEBOX: assert(this->widget_data == 0); - DrawResizeBox(r, this->colour, this->pos_x < (uint)(w->width / 2), !!(w->flags4 & WF_SIZING)); + DrawResizeBox(r, this->colour, this->pos_x < (uint)(w->width / 2), !!(w->flags & WF_SIZING)); break; case WWT_CLOSEBOX: |