diff options
| author | frosch <frosch@openttd.org> | 2010-08-12 09:16:43 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-08-12 09:16:43 +0000 |
| commit | 9e538acc038a2697f00c313763218f1cd3fd6652 (patch) | |
| tree | be3a368d66c1e820e8a677874a75eea3347c4cdc /src/window.cpp | |
| parent | b37be47f162a614ddfb0a777331d7c402930aec5 (diff) | |
| download | openttd-9e538acc038a2697f00c313763218f1cd3fd6652.tar.xz | |
(svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR.
Diffstat (limited to 'src/window.cpp')
| -rw-r--r-- | src/window.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/window.cpp b/src/window.cpp index 5539dae04..c004a4b81 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -337,9 +337,8 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, int click_count) w->HandleButtonClick(widget_index); break; - case WWT_SCROLLBAR: - case WWT_SCROLL2BAR: - case WWT_HSCROLLBAR: + case NWID_VSCROLLBAR: + case NWID_HSCROLLBAR: ScrollbarClickHandler(w, nw, x, y); break; @@ -1382,7 +1381,7 @@ static void DecreaseWindowCounters() /* Unclick scrollbar buttons if they are pressed. */ for (uint i = 0; i < w->nested_array_size; i++) { NWidgetBase *nwid = w->nested_array[i]; - if (nwid != NULL && (nwid->type == WWT_HSCROLLBAR || nwid->type == WWT_SCROLLBAR || nwid->type == WWT_SCROLL2BAR)) { + if (nwid != NULL && (nwid->type == NWID_HSCROLLBAR || nwid->type == NWID_VSCROLLBAR)) { NWidgetScrollbar *sb = static_cast<NWidgetScrollbar*>(nwid); if (sb->disp_flags & (ND_SCROLLBAR_UP | ND_SCROLLBAR_DOWN)) { sb->disp_flags &= ~(ND_SCROLLBAR_UP | ND_SCROLLBAR_DOWN); @@ -1840,7 +1839,7 @@ static EventState HandleScrollbarScrolling() NWidgetScrollbar *sb = w->GetWidget<NWidgetScrollbar>(w->scrolling_scrollbar); bool rtl = false; - if (sb->type == WWT_HSCROLLBAR) { + if (sb->type == NWID_HSCROLLBAR) { i = _cursor.pos.x - _cursorpos_drag_start.x; rtl = _dynlang.text_dir == TD_RTL; } else { |