Merge branch 'linux' into merge_linux

src/dialogxml/widgets/control.hpp

@@ -117,7 +117,7 @@ public:
 		if(getSupportedHandlers().count(t) == 0) throw xHandlerNotSupported(t);
 		auto old_handler = event_handlers[t];
 		if(handler) event_handlers[t] = handler;
-		else event_handlers[t].clear();
+		else event_handlers[t] = nullptr;
 		if(old_handler.empty()) return nullptr;
 		return boost::any_cast<typename event_fcn<t>::type>(old_handler);
 	}

src/dialogxml/widgets/scrollpane.cpp

@@ -13,6 +13,7 @@
 #include "pict.hpp"
 #include "stack.hpp"
 #include "render_shapes.hpp"
+#include <climits>
 
 cScrollPane::cScrollPane(cDialog& parent) : cContainer(CTRL_PANE, parent), scroll(parent) {
 	recalcRect();

src/dialogxml/widgets/stack.cpp

@@ -12,6 +12,7 @@
 #include "message.hpp"
 #include "pict.hpp"
 #include "scrollbar.hpp"
+#include <climits>
 
 bool cStack::hasChild(std::string id) {
 	return controls.find(id) != controls.end();