Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2024-01-02 14:31:56 +00:00
179 changed files with 2191 additions and 1827 deletions

View File

@@ -11,7 +11,7 @@
#define WIDGETS_STATION_WIDGET_H
/** Widgets of the #StationViewWindow class. */
enum StationViewWidgets {
enum StationViewWidgets : WidgetID {
WID_SV_CAPTION, ///< Caption of the window.
WID_SV_GROUP, ///< label for "group by"
WID_SV_GROUP_BY, ///< 'Group by' button
@@ -34,7 +34,7 @@ enum StationViewWidgets {
};
/** Widgets of the #CompanyStationsWindow class. */
enum StationListWidgets {
enum StationListWidgets : WidgetID {
/* Name starts with ST instead of S, because of collision with SaveLoadWidgets */
WID_STL_CAPTION, ///< Caption of the window.
WID_STL_LIST, ///< The main panel, list of stations.
@@ -58,7 +58,7 @@ enum StationListWidgets {
};
/** Widgets of the #SelectStationWindow class. */
enum JoinStationWidgets {
enum JoinStationWidgets : WidgetID {
WID_JS_CAPTION, // Caption of the window.
WID_JS_PANEL, // Main panel.
WID_JS_SCROLLBAR, // Scrollbar of the panel.