From 9e538acc038a2697f00c313763218f1cd3fd6652 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 12 Aug 2010 09:16:43 +0000 Subject: (svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR. --- src/window.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/window.cpp') 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(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(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 { -- cgit v1.2.3-54-g00ecf