Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h

src/widgets/dropdown.cpp

@@ -18,6 +18,8 @@
 
 #include "dropdown_widget.h"
 
+#include "../safeguards.h"
+
 
 void DropDownListItem::Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
 {

src/widgets/genworld_widget.h

@@ -25,9 +25,6 @@ enum GenerateLandscapeWidgets {
 	WID_GL_TOWN_PULLDOWN,               ///< Dropdown 'No. of towns'.
 	WID_GL_INDUSTRY_PULLDOWN,           ///< Dropdown 'No. of industries'.
 
-	WID_GL_RANDOM_EDITBOX,              ///< 'Random seed' editbox.
-	WID_GL_RANDOM_BUTTON,               ///< 'Randomise' button.
-
 	WID_GL_GENERATE_BUTTON,             ///< 'Generate' button.
 
 	WID_GL_START_DATE_DOWN,             ///< Decrease start year.

src/widgets/newgrf_widget.h

@@ -39,6 +39,7 @@ enum NewGRFStateWidgets {
 	WID_NS_REMOVE,            ///< Remove NewGRF from active list.
 	WID_NS_MOVE_UP,           ///< Move NewGRF up in active list.
 	WID_NS_MOVE_DOWN,         ///< Move NewGRF down in active list.
+	WID_NS_UPGRADE,           ///< Upgrade NewGRFs that have a newer version available.
 	WID_NS_FILTER,            ///< Filter list of available NewGRFs.
 	WID_NS_FILE_LIST,         ///< List window of active NewGRFs.
 	WID_NS_SCROLLBAR,         ///< Scrollbar for active NewGRF list.
@@ -60,6 +61,15 @@ enum NewGRFStateWidgets {
 	WID_NS_SHOW_APPLY,        ///< Select display of the buttons below the 'details'.
 };
 
+/** Widgets of the #SavePresetWindow class. */
+enum SavePresetWidgets {
+	WID_SVP_PRESET_LIST, ///< List with available preset names.
+	WID_SVP_SCROLLBAR,   ///< Scrollbar for the list available preset names.
+	WID_SVP_EDITBOX,     ///< Edit box for changing the preset name.
+	WID_SVP_CANCEL,      ///< Button to cancel saving the preset.
+	WID_SVP_SAVE,        ///< Button to save the preset.
+};
+
 /** Widgets of the #ScanProgressWindow class. */
 enum ScanProgressWidgets {
 	WID_SP_PROGRESS_BAR,  ///< Simple progress bar.

src/widgets/settings_widget.h

@@ -23,7 +23,6 @@ enum GameOptionsWidgets {
 	WID_GO_LANG_DROPDOWN,          ///< Language dropdown.
 	WID_GO_RESOLUTION_DROPDOWN,    ///< Dropdown for the resolution.
 	WID_GO_FULLSCREEN_BUTTON,      ///< Toggle fullscreen.
-	WID_GO_SCREENSHOT_DROPDOWN,    ///< Select the screenshot type... please use PNG!.
 	WID_GO_BUTTON_SIZE_DROPDOWN,   ///< Size of in-game UI elements, such as buttons.
 	WID_GO_TEXT_SIZE_DROPDOWN,     ///< Size of medium font, sizes of other fonts are derived from it.
 	WID_GO_VERTICAL_TOOLBAR,       ///< Enable vertical toolbar.

src/widgets/story_widget.h

@@ -23,4 +23,4 @@ enum StoryBookWidgets {
 	WID_SB_NEXT_PAGE, ///< Next button.
 };
 
-#endif /* WIDGETS_STORY_WIDGET_H */
+#endif /* WIDGETS_STORY_WIDGET_H */