Merge branch 'master' into jgrpp

# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h

src/window.cpp

@@ -2443,14 +2443,14 @@ static EventState HandleActiveWidget()
 				return ES_HANDLED;
 			}
 
-			/* If cursor hasn't moved, there is nothing to do. */
-			if (_cursor.delta.x == 0 && _cursor.delta.y == 0) return ES_HANDLED;
-
 			/* Handle scrollbar internally, or dispatch click event */
 			WidgetType type = w->GetWidget<NWidgetBase>(w->mouse_capture_widget)->type;
 			if (type == NWID_VSCROLLBAR || type == NWID_HSCROLLBAR) {
 				HandleScrollbarScrolling(w);
 			} else {
+				/* If cursor hasn't moved, there is nothing to do. */
+				if (_cursor.delta.x == 0 && _cursor.delta.y == 0) return ES_HANDLED;
+
 				Point pt = { _cursor.pos.x - w->left, _cursor.pos.y - w->top };
 				w->OnClick(pt, w->mouse_capture_widget, 0);
 			}