Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						ba34ec7ade 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h 
						
						
					 
					
						2019-03-27 18:12:04 +00:00 
						 
				 
			
				
					
						
							
							
								peter1138 
							
						 
					 
					
						
						
							
						
						317f69c152 
					 
					
						
						
							
							Codechange: Use override specifier in Window-derived classes.  
						
						
						
						
					 
					
						2019-03-24 16:10:04 +01:00 
						 
				 
			
				
					
						
							
							
								keldorkatarn 
							
						 
					 
					
						
						
							
						
						4955996b35 
					 
					
						
						
							
							Remove costly recalculation of a date format we already have.  
						
						... 
						
						
						
						(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36  
						
						
					 
					
						2018-04-17 16:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						2be4215f43 
					 
					
						
						
							
							(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values  
						
						
						
						
					 
					
						2014-04-23 20:13:33 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						0463dbdc9e 
					 
					
						
						
							
							(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values  
						
						
						
						
					 
					
						2014-04-23 20:13:33 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						13badddd75 
					 
					
						
						
							
							(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.  
						
						
						
						
					 
					
						2013-05-26 19:30:07 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						4e4e635916 
					 
					
						
						
							
							(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.  
						
						
						
						
					 
					
						2013-05-26 19:30:07 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						16feb5c4e9 
					 
					
						
						
							
							(svn r25290) -Add: Assign string names to notable windows.  
						
						
						
						
					 
					
						2013-05-26 19:25:01 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						8157a8afd8 
					 
					
						
						
							
							(svn r25290) -Add: Assign string names to notable windows.  
						
						
						
						
					 
					
						2013-05-26 19:25:01 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						25adefca23 
					 
					
						
						
							
							(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.  
						
						
						
						
					 
					
						2013-05-26 19:23:42 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						56e4a8c4d6 
					 
					
						
						
							
							(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.  
						
						
						
						
					 
					
						2013-05-26 19:23:42 +00:00 
						 
				 
			
				
					
						
							
							
								planetmaker 
							
						 
					 
					
						
						
							
						
						f00d9976f9 
					 
					
						
						
							
							(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)  
						
						
						
						
					 
					
						2013-01-08 22:46:42 +00:00 
						 
				 
			
				
					
						
							
							
								planetmaker 
							
						 
					 
					
						
						
							
						
						c24374f99c 
					 
					
						
						
							
							(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)  
						
						
						
						
					 
					
						2013-01-08 22:46:42 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						d5eeab43b7 
					 
					
						
						
							
							(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files  
						
						
						
						
					 
					
						2012-01-03 21:32:51 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						6d6be50ae0 
					 
					
						
						
							
							(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files  
						
						
						
						
					 
					
						2012-01-03 21:32:51 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						e054cd36b9 
					 
					
						
						
							
							(svn r23547) -Codechange: document and rename widgets to be consistent and understandable  
						
						
						
						
					 
					
						2011-12-16 18:21:13 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						e2726ca3f1 
					 
					
						
						
							
							(svn r23547) -Codechange: document and rename widgets to be consistent and understandable  
						
						
						
						
					 
					
						2011-12-16 18:21:13 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						d1dc135461 
					 
					
						
						
							
							(svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile  
						
						
						
						
					 
					
						2011-12-16 16:23:50 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						98d3f11d45 
					 
					
						
						
							
							(svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile  
						
						
						
						
					 
					
						2011-12-16 16:23:50 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						49e88dcbf0 
					 
					
						
						
							
							(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h  
						
						
						
						
					 
					
						2011-12-15 22:22:55 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						2aa774e831 
					 
					
						
						
							
							(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h  
						
						
						
						
					 
					
						2011-12-15 22:22:55 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						4b4a40a72e 
					 
					
						
						
							
							(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().  
						
						
						
						
					 
					
						2011-03-13 21:31:29 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						ec9540a12a 
					 
					
						
						
							
							(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().  
						
						
						
						
					 
					
						2011-03-13 21:31:29 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						0722492c1b 
					 
					
						
						
							
							(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().  
						
						
						
						
					 
					
						2010-11-26 15:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						f5c6fd1a25 
					 
					
						
						
							
							(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().  
						
						
						
						
					 
					
						2010-11-26 15:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								glx 
							
						 
					 
					
						
						
							
						
						5ea9b7c6ec 
					 
					
						
						
							
							(svn r21309) -Fix: second parameter of SetupSubsidyDecodeParam() is a bool, so use a bool when calling the function  
						
						
						
						
					 
					
						2010-11-24 01:08:49 +00:00 
						 
				 
			
				
					
						
							
							
								glx 
							
						 
					 
					
						
						
							
						
						4231154bb4 
					 
					
						
						
							
							(svn r21309) -Fix: second parameter of SetupSubsidyDecodeParam() is a bool, so use a bool when calling the function  
						
						
						
						
					 
					
						2010-11-24 01:08:49 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						2d5ef5e5a8 
					 
					
						
						
							
							(svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR.  
						
						
						
						
					 
					
						2010-08-12 09:16:43 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						9e538acc03 
					 
					
						
						
							
							(svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR.  
						
						
						
						
					 
					
						2010-08-12 09:16:43 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						4817d5dcd6 
					 
					
						
						
							
							(svn r20453) -Codechange: Remove direct accesses to Window::hscroll, vscroll and vscroll2.  
						
						... 
						
						
						
						Note: All windows get individual members with the same names, which are initialised via Window::GetScrollbar(). This caching is not required at all, but simplifies conversion. 
						
						
					 
					
						2010-08-12 08:37:01 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						71ca58c2bb 
					 
					
						
						
							
							(svn r20453) -Codechange: Remove direct accesses to Window::hscroll, vscroll and vscroll2.  
						
						... 
						
						
						
						Note: All windows get individual members with the same names, which are initialised via Window::GetScrollbar(). This caching is not required at all, but simplifies conversion. 
						
						
					 
					
						2010-08-12 08:37:01 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						341f41e347 
					 
					
						
						
							
							(svn r20452) -Codechange: Remove NWidgetCore::FindScrollbar() and associate scrollbar explicitly using a NWidgetPart via SetScrollbar().  
						
						
						
						
					 
					
						2010-08-12 06:44:45 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						10339c60c0 
					 
					
						
						
							
							(svn r20452) -Codechange: Remove NWidgetCore::FindScrollbar() and associate scrollbar explicitly using a NWidgetPart via SetScrollbar().  
						
						
						
						
					 
					
						2010-08-12 06:44:45 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						a50578c3ad 
					 
					
						
						
							
							(svn r20223) -Codechange: Replace scrolled row calculations by a call to GetScrolledRowFromWidget().  
						
						
						
						
					 
					
						2010-07-26 13:08:48 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						4203e641f8 
					 
					
						
						
							
							(svn r20223) -Codechange: Replace scrolled row calculations by a call to GetScrolledRowFromWidget().  
						
						
						
						
					 
					
						2010-07-26 13:08:48 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						94a5c917a5 
					 
					
						
						
							
							(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().  
						
						
						
						
					 
					
						2010-01-30 18:34:48 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						88019e64e1 
					 
					
						
						
							
							(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().  
						
						
						
						
					 
					
						2010-01-30 18:34:48 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						9467b7c6d6 
					 
					
						
						
							
							(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header  
						
						
						
						
					 
					
						2010-01-15 16:41:15 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						82fc28f77f 
					 
					
						
						
							
							(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header  
						
						
						
						
					 
					
						2010-01-15 16:41:15 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						6cac8be361 
					 
					
						
						
							
							(svn r18717) -Codechange: use TileArea in industry instead of three separate variables. Also make use of TileArea functions for determining the 'width' and 'height' of an industry.  
						
						
						
						
					 
					
						2010-01-04 18:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						87466a4ed0 
					 
					
						
						
							
							(svn r18717) -Codechange: use TileArea in industry instead of three separate variables. Also make use of TileArea functions for determining the 'width' and 'height' of an industry.  
						
						
						
						
					 
					
						2010-01-04 18:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						0e9dac92d2 
					 
					
						
						
							
							(svn r18588) -Feature [FS#2943]: Add shading and unshading of windows.  
						
						
						
						
					 
					
						2009-12-21 16:24:29 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						91872aca48 
					 
					
						
						
							
							(svn r18588) -Feature [FS#2943]: Add shading and unshading of windows.  
						
						
						
						
					 
					
						2009-12-21 16:24:29 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						f20e477a02 
					 
					
						
						
							
							(svn r18580) -Codechange: Use widget information only for setting scrollbar capacity.  
						
						
						
						
					 
					
						2009-12-20 20:08:39 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						5a083f183e 
					 
					
						
						
							
							(svn r18580) -Codechange: Use widget information only for setting scrollbar capacity.  
						
						
						
						
					 
					
						2009-12-20 20:08:39 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						45eb0be570 
					 
					
						
						
							
							(svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice.  
						
						
						
						
					 
					
						2009-11-28 14:42:35 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						293dfd7c3e 
					 
					
						
						
							
							(svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice.  
						
						
						
						
					 
					
						2009-11-28 14:42:35 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						50359b2d08 
					 
					
						
						
							
							(svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions  
						
						
						
						
					 
					
						2009-11-24 18:05:55 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						14300d309c 
					 
					
						
						
							
							(svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions  
						
						
						
						
					 
					
						2009-11-24 18:05:55 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						f8b79068e6 
					 
					
						
						
							
							(svn r18274) -Codechange: remove the unused WDF flags  
						
						
						
						
					 
					
						2009-11-24 17:28:29 +00:00