cpp/openttd-patchpack/source Changeset - r28354:ddc7bb191071

Changeset - r28354:ddc7bb191071

Parent rev.

Child rev.

[Not reviewed]

master

0 60 0

Peter Nelson - 11 months ago 2023-12-29 21:15:25
peter1138@openttd.org

Codechange: Set storage type of widget enums to WidgetID.

60 files changed with 120 insertions and 120 deletions:

src/widgets/ai_widget.h

src/widgets/airport_widget.h

src/widgets/autoreplace_widget.h

src/widgets/bootstrap_widget.h

src/widgets/bridge_widget.h

src/widgets/build_vehicle_widget.h

src/widgets/cheat_widget.h

src/widgets/company_widget.h

src/widgets/console_widget.h

src/widgets/date_widget.h

src/widgets/depot_widget.h

src/widgets/dock_widget.h

src/widgets/dropdown_widget.h

src/widgets/engine_widget.h

src/widgets/error_widget.h

src/widgets/fios_widget.h

src/widgets/framerate_widget.h

src/widgets/game_widget.h

src/widgets/genworld_widget.h

src/widgets/goal_widget.h

src/widgets/graph_widget.h

src/widgets/group_widget.h

src/widgets/help_widget.h

src/widgets/highscore_widget.h

src/widgets/industry_widget.h

src/widgets/intro_widget.h

src/widgets/league_widget.h

src/widgets/link_graph_legend_widget.h

src/widgets/main_widget.h

src/widgets/misc_widget.h

src/widgets/music_widget.h

src/widgets/network_chat_widget.h

src/widgets/network_content_widget.h

src/widgets/network_widget.h

src/widgets/newgrf_debug_widget.h

src/widgets/newgrf_widget.h

src/widgets/news_widget.h

src/widgets/object_widget.h

src/widgets/order_widget.h

src/widgets/osk_widget.h

src/widgets/rail_widget.h

src/widgets/road_widget.h

src/widgets/screenshot_widget.h

src/widgets/script_widget.h

src/widgets/settings_widget.h

src/widgets/sign_widget.h

src/widgets/smallmap_widget.h

src/widgets/station_widget.h

src/widgets/statusbar_widget.h

src/widgets/story_widget.h

src/widgets/subsidy_widget.h

src/widgets/terraform_widget.h

src/widgets/timetable_widget.h

src/widgets/toolbar_widget.h

src/widgets/town_widget.h

src/widgets/transparency_widget.h

src/widgets/tree_widget.h

src/widgets/vehicle_widget.h

src/widgets/viewport_widget.h

src/widgets/waypoint_widget.h

0 comments (0 inline, 0 general)

src/widgets/ai_widget.h

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
 #ifndef WIDGETS_AI_WIDGET_H
 #define WIDGETS_AI_WIDGET_H
 #include "../textfile_type.h"
 /** Widgets of the #AIConfigWindow class. */
 enum AIConfigWidgets {
+enum AIConfigWidgets : WidgetID {
 	WID_AIC_BACKGROUND,       ///< Window background.
 	WID_AIC_DECREASE_NUMBER,  ///< Decrease the number of AIs.
 	WID_AIC_INCREASE_NUMBER,  ///< Increase the number of AIs.
 	WID_AIC_NUMBER,           ///< Number of AIs.
 	WID_AIC_DECREASE_INTERVAL,///< Decrease the interval.
 	WID_AIC_INCREASE_INTERVAL,///< Increase the interval.

src/widgets/airport_widget.h

➞

Show inline comments

@@ @@ -8,21 +8,21 @@ @@
 /** @file airport_widget.h Types related to the airport widgets. */
 #ifndef WIDGETS_AIRPORT_WIDGET_H
 #define WIDGETS_AIRPORT_WIDGET_H
 /** Widgets of the #BuildAirToolbarWindow class. */
 enum AirportToolbarWidgets {
+enum AirportToolbarWidgets : WidgetID {
 	WID_AT_AIRPORT,  ///< Build airport button.
 	WID_AT_DEMOLISH, ///< Demolish button.
 	INVALID_WID_AT = -1,
 };
 /** Widgets of the #BuildAirportWindow class. */
 enum AirportPickerWidgets {
+enum AirportPickerWidgets : WidgetID {
 	WID_AP_CLASS_DROPDOWN,  ///< Dropdown of airport classes.
 	WID_AP_AIRPORT_LIST,    ///< List of airports.
 	WID_AP_SCROLLBAR,       ///< Scrollbar of the list.
 	WID_AP_LAYOUT_NUM,      ///< Current number of the layout.
 	WID_AP_LAYOUT_DECREASE, ///< Decrease the layout number.
 	WID_AP_LAYOUT_INCREASE, ///< Increase the layout number.

src/widgets/autoreplace_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file autoreplace_widget.h Types related to the autoreplace widgets. */
 #ifndef WIDGETS_AUTOREPLACE_WIDGET_H
 #define WIDGETS_AUTOREPLACE_WIDGET_H
 /** Widgets of the #ReplaceVehicleWindow class. */
 enum ReplaceVehicleWidgets {
+enum ReplaceVehicleWidgets : WidgetID {
 	WID_RV_CAPTION,                  ///< Caption of the window.
 	/* Sort dropdown at the right. */
 	WID_RV_SORT_ASCENDING_DESCENDING, ///< Ascending/descending sort order button.
 	WID_RV_SHOW_HIDDEN_ENGINES,       ///< Toggle whether to display the hidden vehicles.
 	WID_RV_SORT_DROPDOWN,             ///< Dropdown for the sort criteria.

src/widgets/bootstrap_widget.h

➞

Show inline comments

@@ @@ -8,25 +8,25 @@ @@
 /** @file bootstrap_widget.h Types related to the bootstrap widgets. */
 #ifndef WIDGETS_BOOTSTRAP_WIDGET_H
 #define WIDGETS_BOOTSTRAP_WIDGET_H
 /** Widgets of the #BootstrapBackground class. */
 enum BootstrapBackgroundWidgets {
+enum BootstrapBackgroundWidgets : WidgetID {
 	WID_BB_BACKGROUND, ///< Background of the window.
 };
 /** Widgets of the #BootstrapErrmsgWindow class. */
 enum BootstrapErrorMessageWidgets {
+enum BootstrapErrorMessageWidgets : WidgetID {
 	WID_BEM_CAPTION, ///< Caption of the window.
 	WID_BEM_MESSAGE, ///< Error message.
 	WID_BEM_QUIT,    ///< Quit button.
 };
 /** Widgets of the #BootstrapContentDownloadStatusWindow class. */
 enum BootstrapAskForDownloadWidgets {
+enum BootstrapAskForDownloadWidgets : WidgetID {
 	WID_BAFD_QUESTION, ///< The question whether to download.
 	WID_BAFD_YES,      ///< An affirmative answer to the question.
 	WID_BAFD_NO,       ///< An negative answer to the question.
 };
 #endif /* WIDGETS_BOOTSTRAP_WIDGET_H */

src/widgets/bridge_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file bridge_widget.h Types related to the bridge widgets. */
 #ifndef WIDGETS_BRIDGE_WIDGET_H
 #define WIDGETS_BRIDGE_WIDGET_H
 /** Widgets of the #BuildBridgeWindow class. */
 enum BuildBridgeSelectionWidgets {
+enum BuildBridgeSelectionWidgets : WidgetID {
 	WID_BBS_CAPTION,           ///< Caption of the window.
 	WID_BBS_DROPDOWN_ORDER,    ///< Direction of sort dropdown.
 	WID_BBS_DROPDOWN_CRITERIA, ///< Criteria of sort dropdown.
 	WID_BBS_BRIDGE_LIST,       ///< List of bridges.
 	WID_BBS_SCROLLBAR,         ///< Scrollbar of the list.
 };

src/widgets/build_vehicle_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file build_vehicle_widget.h Types related to the build_vehicle widgets. */
 #ifndef WIDGETS_BUILD_VEHICLE_WIDGET_H
 #define WIDGETS_BUILD_VEHICLE_WIDGET_H
 /** Widgets of the #BuildVehicleWindow class. */
 enum BuildVehicleWidgets {
+enum BuildVehicleWidgets : WidgetID {
 	WID_BV_CAPTION,                   ///< Caption of window.
 	WID_BV_SORT_ASCENDING_DESCENDING, ///< Sort direction.
 	WID_BV_SORT_DROPDOWN,             ///< Criteria of sorting dropdown.
 	WID_BV_CARGO_FILTER_DROPDOWN,     ///< Cargo filter dropdown.
 	WID_BV_FILTER,                    ///< Filter by name.
 	WID_BV_SHOW_HIDDEN_ENGINES,       ///< Toggle whether to display the hidden vehicles.

src/widgets/cheat_widget.h

➞

Show inline comments

@@ @@ -8,12 +8,12 @@ @@
 /** @file cheat_widget.h Types related to the cheat widgets. */
 #ifndef WIDGETS_CHEAT_WIDGET_H
 #define WIDGETS_CHEAT_WIDGET_H
 /** Widgets of the #CheatWindow class. */
 enum CheatWidgets {
+enum CheatWidgets : WidgetID {
 	WID_C_NOTE,  ///< Note on top of panel for use of cheat.
 	WID_C_PANEL, ///< Panel where all cheats are shown in.
 };
 #endif /* WIDGETS_CHEAT_WIDGET_H */

src/widgets/company_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file company_widget.h Types related to the company widgets. */
 #ifndef WIDGETS_COMPANY_WIDGET_H
 #define WIDGETS_COMPANY_WIDGET_H
 /** Widgets of the #CompanyWindow class. */
 enum CompanyWidgets {
+enum CompanyWidgets : WidgetID {
 	WID_C_CAPTION,                    ///< Caption of the window.
 	WID_C_FACE,                       ///< View of the face.
 	WID_C_FACE_TITLE,                 ///< Title for the face.
 	WID_C_DESC_INAUGURATION,          ///< Inauguration.
@@ @@ -51,13 +51,13 @@ enum CompanyWidgets { @@
 	WID_C_SELECT_MULTIPLAYER,         ///< Multiplayer selection panel.
 	WID_C_COMPANY_PASSWORD,           ///< Button to set company password.
 	WID_C_COMPANY_JOIN,               ///< Button to join company.
 };
 /** Widgets of the #CompanyFinancesWindow class. */
 enum CompanyFinancesWidgets {
+enum CompanyFinancesWidgets : WidgetID {
 	WID_CF_CAPTION,        ///< Caption of the window.
 	WID_CF_TOGGLE_SIZE,    ///< Toggle windows size.
 	WID_CF_SEL_PANEL,      ///< Select panel or nothing.
 	WID_CF_EXPS_CATEGORY,  ///< Column for expenses category strings.
 	WID_CF_EXPS_PRICE1,    ///< Column for year Y-2 expenses.
 	WID_CF_EXPS_PRICE2,    ///< Column for year Y-1 expenses.
@@ @@ -75,13 +75,13 @@ enum CompanyFinancesWidgets { @@
 	WID_CF_REPAY_LOAN,     ///< Decrease loan..
 	WID_CF_INFRASTRUCTURE, ///< View company infrastructure.
 };
 /** Widgets of the #SelectCompanyLiveryWindow class. */
 enum SelectCompanyLiveryWidgets {
+enum SelectCompanyLiveryWidgets : WidgetID {
 	WID_SCL_CAPTION,          ///< Caption of window.
 	WID_SCL_CLASS_GENERAL,    ///< Class general.
 	WID_SCL_CLASS_RAIL,       ///< Class rail.
 	WID_SCL_CLASS_ROAD,       ///< Class road.
 	WID_SCL_CLASS_SHIP,       ///< Class ship.
 	WID_SCL_CLASS_AIRCRAFT,   ///< Class aircraft.
@@ @@ -99,13 +99,13 @@ enum SelectCompanyLiveryWidgets { @@
 /**
  * Widgets of the #SelectCompanyManagerFaceWindow class.
  * Do not change the order of the widgets from WID_SCMF_HAS_MOUSTACHE_EARRING to WID_SCMF_GLASSES_R,
  * this order is needed for the WE_CLICK event of DrawFaceStringLabel().
  */
 enum SelectCompanyManagerFaceWidgets {
+enum SelectCompanyManagerFaceWidgets : WidgetID {
 	WID_SCMF_CAPTION,                    ///< Caption of window.
 	WID_SCMF_TOGGLE_LARGE_SMALL,         ///< Toggle for large or small.
 	WID_SCMF_SELECT_FACE,                ///< Select face.
 	WID_SCMF_CANCEL,                     ///< Cancel.
 	WID_SCMF_ACCEPT,                     ///< Accept.
 	WID_SCMF_MALE,                       ///< Male button in the simple view.
@@ @@ -167,13 +167,13 @@ enum SelectCompanyManagerFaceWidgets { @@
 	WID_SCMF_GLASSES_L,                  ///< Glasses left.
 	WID_SCMF_GLASSES,                    ///< Glasses.
 	WID_SCMF_GLASSES_R,                  ///< Glasses right.
 };
 /** Widgets of the #CompanyInfrastructureWindow class. */
 enum CompanyInfrastructureWidgets {
+enum CompanyInfrastructureWidgets : WidgetID {
 	WID_CI_CAPTION,       ///< Caption of window.
 	WID_CI_RAIL_DESC,     ///< Description of rail.
 	WID_CI_RAIL_COUNT,    ///< Count of rail.
 	WID_CI_ROAD_DESC,     ///< Description of road.
 	WID_CI_ROAD_COUNT,    ///< Count of road.
 	WID_CI_TRAM_DESC,     ///< Description of tram.
@@ @@ -184,13 +184,13 @@ enum CompanyInfrastructureWidgets { @@
 	WID_CI_STATION_COUNT, ///< Count of station.
 	WID_CI_TOTAL_DESC,    ///< Description of total.
 	WID_CI_TOTAL,         ///< Count of total.
 };
 /** Widgets of the #BuyCompanyWindow class. */
 enum BuyCompanyWidgets {
+enum BuyCompanyWidgets : WidgetID {
 	WID_BC_CAPTION,  ///< Caption of window.
 	WID_BC_FACE,     ///< Face button.
 	WID_BC_QUESTION, ///< Question text.
 	WID_BC_NO,       ///< No button.
 	WID_BC_YES,      ///< Yes button.
 };

src/widgets/console_widget.h

➞

Show inline comments

@@ @@ -8,11 +8,11 @@ @@
 /** @file console_widget.h Types related to the console widgets. */
 #ifndef WIDGETS_CONSOLE_WIDGET_H
 #define WIDGETS_CONSOLE_WIDGET_H
 /** Widgets of the #IConsoleWindow class. */
 enum ConsoleWidgets {
+enum ConsoleWidgets : WidgetID {
 	WID_C_BACKGROUND, ///< Background of the console.
 };
 #endif /* WIDGETS_CONSOLE_WIDGET_H */

src/widgets/date_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file date_widget.h Types related to the date widgets. */
 #ifndef WIDGETS_DATE_WIDGET_H
 #define WIDGETS_DATE_WIDGET_H
 /** Widgets of the #SetDateWindow class. */
 enum SetDateWidgets {
+enum SetDateWidgets : WidgetID {
 	WID_SD_DAY,      ///< Dropdown for the day.
 	WID_SD_MONTH,    ///< Dropdown for the month.
 	WID_SD_YEAR,     ///< Dropdown for the year.
 	WID_SD_SET_DATE, ///< Actually set the date.
 };

src/widgets/depot_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file depot_widget.h Types related to the depot widgets. */
 #ifndef WIDGETS_DEPOT_WIDGET_H
 #define WIDGETS_DEPOT_WIDGET_H
 /** Widgets of the #DepotWindow class. */
 enum DepotWidgets {
+enum DepotWidgets : WidgetID {
 	WID_D_CAPTION,         ///< Caption of window.
 	WID_D_SELL,            ///< Sell button.
 	WID_D_SHOW_SELL_CHAIN, ///< Show sell chain panel.
 	WID_D_SELL_CHAIN,      ///< Sell chain button.
 	WID_D_SELL_ALL,        ///< Sell all button.
 	WID_D_AUTOREPLACE,     ///< Autoreplace button.

src/widgets/dock_widget.h

➞

Show inline comments

@@ @@ -8,20 +8,20 @@ @@
 /** @file dock_widget.h Types related to the dock widgets. */
 #ifndef WIDGETS_DOCK_WIDGET_H
 #define WIDGETS_DOCK_WIDGET_H
 /** Widgets of the #BuildDocksDepotWindow class. */
 enum BuildDockDepotWidgets {
+enum BuildDockDepotWidgets : WidgetID {
 	WID_BDD_BACKGROUND, ///< Background of the window.
 	WID_BDD_X,          ///< X-direction button.
 	WID_BDD_Y,          ///< Y-direction button.
 };
 /** Widgets of the #BuildDocksToolbarWindow class. */
 enum DockToolbarWidgets {
+enum DockToolbarWidgets : WidgetID {
 	WID_DT_CANAL,          ///< Build canal button.
 	WID_DT_LOCK,           ///< Build lock button.
 	WID_DT_DEMOLISH,       ///< Demolish aka dynamite button.
 	WID_DT_DEPOT,          ///< Build depot button.
 	WID_DT_STATION,        ///< Build station button.
 	WID_DT_BUOY,           ///< Build buoy button.

src/widgets/dropdown_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file dropdown_widget.h Types related to the dropdown widgets. */
 #ifndef WIDGETS_DROPDOWN_WIDGET_H
 #define WIDGETS_DROPDOWN_WIDGET_H
 /** Widgets of the #DropdownWindow class. */
 enum DropdownMenuWidgets {
+enum DropdownMenuWidgets : WidgetID {
 	WID_DM_ITEMS,        ///< Panel showing the dropdown items.
 	WID_DM_SHOW_SCROLL,  ///< Hide scrollbar if too few items.
 	WID_DM_SCROLL,       ///< Scrollbar.
 };
 #endif /* WIDGETS_DROPDOWN_WIDGET_H */

src/widgets/engine_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file engine_widget.h Types related to the engine widgets. */
 #ifndef WIDGETS_ENGINE_WIDGET_H
 #define WIDGETS_ENGINE_WIDGET_H
 /** Widgets of the #EnginePreviewWindow class. */
 enum EnginePreviewWidgets {
+enum EnginePreviewWidgets : WidgetID {
 	WID_EP_QUESTION, ///< The container for the question.
 	WID_EP_NO,       ///< No button.
 	WID_EP_YES,      ///< Yes button.
 };
 #endif /* WIDGETS_ENGINE_WIDGET_H */

src/widgets/error_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file error_widget.h Types related to the error widgets. */
 #ifndef WIDGETS_ERROR_WIDGET_H
 #define WIDGETS_ERROR_WIDGET_H
 /** Widgets of the #ErrmsgWindow class. */
 enum ErrorMessageWidgets {
+enum ErrorMessageWidgets : WidgetID {
 	WID_EM_CAPTION, ///< Caption of the window.
 	WID_EM_FACE,    ///< Error title.
 	WID_EM_MESSAGE, ///< Error message.
 };
 #endif /* WIDGETS_ERROR_WIDGET_H */

src/widgets/fios_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file fios_widget.h Types related to the fios widgets. */
 #ifndef WIDGETS_FIOS_WIDGET_H
 #define WIDGETS_FIOS_WIDGET_H
 /** Widgets of the #SaveLoadWindow class. */
 enum SaveLoadWidgets {
+enum SaveLoadWidgets : WidgetID {
 	WID_SL_CAPTION,                 ///< Caption of the window.
 	WID_SL_SORT_BYNAME,             ///< Sort by name button.
 	WID_SL_SORT_BYDATE,             ///< Sort by date button.
 	WID_SL_FILTER,                  ///< Filter list of files
 	WID_SL_BACKGROUND,              ///< Background of window.
 	WID_SL_FILE_BACKGROUND,         ///< Background of file selection.

src/widgets/framerate_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file framerate_widget.h Types related to the framerate windows widgets. */
 #ifndef WIDGETS_FRAMERATE_WIDGET_H
 #define WIDGETS_FRAMERATE_WIDGET_H
 /** Widgets of the #FramerateWindow class. */
 enum FramerateWindowWidgets {
+enum FramerateWindowWidgets : WidgetID {
 	WID_FRW_CAPTION,
 	WID_FRW_RATE_GAMELOOP,
 	WID_FRW_RATE_DRAWING,
 	WID_FRW_RATE_FACTOR,
 	WID_FRW_INFO_DATA_POINTS,
 	WID_FRW_TIMES_NAMES,
@@ @@ -23,12 +23,12 @@ enum FramerateWindowWidgets { @@
 	WID_FRW_ALLOCSIZE,
 	WID_FRW_SEL_MEMORY,
 	WID_FRW_SCROLLBAR,
 };
 /** Widgets of the #FrametimeGraphWindow class. */
 enum FrametimeGraphWindowWidgets {
+enum FrametimeGraphWindowWidgets : WidgetID {
 	WID_FGW_CAPTION,
 	WID_FGW_GRAPH,
 };
 #endif /* WIDGETS_FRAMERATE_WIDGET_H */

src/widgets/game_widget.h

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
 #ifndef WIDGETS_GS_WIDGET_H
 #define WIDGETS_GS_WIDGET_H
 #include "../textfile_type.h"
 /** Widgets of the #GSConfigWindow class. */
 enum GSConfigWidgets {
+enum GSConfigWidgets : WidgetID {
 	WID_GSC_BACKGROUND,       ///< Window background.
 	WID_GSC_GSLIST,           ///< List with current selected Game Script.
 	WID_GSC_SETTINGS,         ///< Panel to draw the Game Script settings on
 	WID_GSC_SCROLLBAR,        ///< Scrollbar to scroll through the selected AIs.
 	WID_GSC_CHANGE,           ///< Select another Game Script button.
 	WID_GSC_OPEN_URL,         ///< Open GS URL.

src/widgets/genworld_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file genworld_widget.h Types related to the genworld widgets. */
 #ifndef WIDGETS_GENWORLD_WIDGET_H
 #define WIDGETS_GENWORLD_WIDGET_H
 /** Widgets of the #GenerateLandscapeWindow class. */
 enum GenerateLandscapeWidgets {
+enum GenerateLandscapeWidgets : WidgetID {
 	WID_GL_TEMPERATE,                   ///< Button with icon "Temperate".
 	WID_GL_ARCTIC,                      ///< Button with icon "Arctic".
 	WID_GL_TROPICAL,                    ///< Button with icon "Tropical".
 	WID_GL_TOYLAND,                     ///< Button with icon "Toyland".
 	WID_GL_MAPSIZE_X_PULLDOWN,          ///< Dropdown 'map X size'.
@@ @@ -66,13 +66,13 @@ enum GenerateLandscapeWidgets { @@
 	WID_GL_CLIMATE_SEL_LABEL,           ///< NWID_SELECTION for snow or desert coverage label
 	WID_GL_CLIMATE_SEL_SELECTOR,        ///< NWID_SELECTION for snow or desert coverage selector
 };
 /** Widgets of the #CreateScenarioWindow class. */
 enum CreateScenarioWidgets {
+enum CreateScenarioWidgets : WidgetID {
 	WID_CS_TEMPERATE,              ///< Select temperate landscape style.
 	WID_CS_ARCTIC,                 ///< Select arctic landscape style.
 	WID_CS_TROPICAL,               ///< Select tropical landscape style.
 	WID_CS_TOYLAND,                ///< Select toy-land landscape style.
 	WID_CS_EMPTY_WORLD,            ///< Generate an empty flat world.
 	WID_CS_RANDOM_WORLD,           ///< Generate random land button
@@ @@ -84,13 +84,13 @@ enum CreateScenarioWidgets { @@
 	WID_CS_FLAT_LAND_HEIGHT_DOWN,  ///< Decrease flat land height.
 	WID_CS_FLAT_LAND_HEIGHT_TEXT,  ///< Clickable flat land height value.
 	WID_CS_FLAT_LAND_HEIGHT_UP,    ///< Increase flat land height.
 };
 /** Widgets of the #GenerateProgressWindow class. */
 enum GenerationProgressWidgets {
+enum GenerationProgressWidgets : WidgetID {
 	WID_GP_PROGRESS_BAR,  ///< Progress bar.
 	WID_GP_PROGRESS_TEXT, ///< Text with the progress bar.
 	WID_GP_ABORT,         ///< Abort button.
 };
 #endif /* WIDGETS_GENWORLD_WIDGET_H */

src/widgets/goal_widget.h

➞

Show inline comments

@@ @@ -9,23 +9,23 @@ @@
 /** @file goal_widget.h Types related to the goal widgets. */
 #ifndef WIDGETS_GOAL_WIDGET_H
 #define WIDGETS_GOAL_WIDGET_H
 /** Widgets of the #GoalListWindow class. */
 enum GoalListWidgets {
+enum GoalListWidgets : WidgetID {
 	WID_GOAL_CAPTION,         ///< Caption of the window.
 	WID_GOAL_SELECT_BUTTONS,  ///< Selection widget for the title bar button.
 	WID_GOAL_GLOBAL_BUTTON,   ///< Button to show global goals.
 	WID_GOAL_COMPANY_BUTTON,  ///< Button to show company goals.
 	WID_GOAL_LIST,            ///< Goal list.
 	WID_GOAL_SCROLLBAR,       ///< Scrollbar of the goal list.
 };
 /** Widgets of the #GoalQuestionWindow class. */
 enum GoalQuestionWidgets {
+enum GoalQuestionWidgets : WidgetID {
 	WID_GQ_CAPTION,        ///< Caption of the window.
 	WID_GQ_QUESTION,       ///< Question text.
 	WID_GQ_BUTTONS,        ///< Buttons selection (between 1, 2 or 3).
 	WID_GQ_BUTTON_1,       ///< First button.
 	WID_GQ_BUTTON_2,       ///< Second button.
 	WID_GQ_BUTTON_3,       ///< Third button.

src/widgets/graph_widget.h

➞

Show inline comments

@@ @@ -11,51 +11,51 @@ @@
 #define WIDGETS_GRAPH_WIDGET_H
 #include "../economy_type.h"
 #include "../company_type.h"
 /** Widgets of the #GraphLegendWindow class. */
 enum GraphLegendWidgets {
+enum GraphLegendWidgets : WidgetID {
 	WID_GL_BACKGROUND,    ///< Background of the window.
 	WID_GL_FIRST_COMPANY, ///< First company in the legend.
 	WID_GL_LAST_COMPANY = WID_GL_FIRST_COMPANY + MAX_COMPANIES - 1, ///< Last company in the legend.
 };
 /** Widgets of the #OperatingProfitGraphWindow class, #IncomeGraphWindow class, #DeliveredCargoGraphWindow class, and #CompanyValueGraphWindow class. */
 enum CompanyValueWidgets {
+enum CompanyValueWidgets : WidgetID {
 	WID_CV_KEY_BUTTON, ///< Key button.
 	WID_CV_BACKGROUND, ///< Background of the window.
 	WID_CV_GRAPH,      ///< Graph itself.
 	WID_CV_RESIZE,     ///< Resize button.
 };
 /** Widget of the #PerformanceHistoryGraphWindow class. */
 enum PerformanceHistoryGraphWidgets {
+enum PerformanceHistoryGraphWidgets : WidgetID {
 	WID_PHG_KEY,                  ///< Key button.
 	WID_PHG_DETAILED_PERFORMANCE, ///< Detailed performance.
 	WID_PHG_BACKGROUND,           ///< Background of the window.
 	WID_PHG_GRAPH,                ///< Graph itself.
 	WID_PHG_RESIZE,               ///< Resize button.
 };
 /** Widget of the #PaymentRatesGraphWindow class. */
 enum CargoPaymentRatesWidgets {
+enum CargoPaymentRatesWidgets : WidgetID {
 	WID_CPR_BACKGROUND,      ///< Background of the window.
 	WID_CPR_HEADER,          ///< Header.
 	WID_CPR_GRAPH,           ///< Graph itself.
 	WID_CPR_RESIZE,          ///< Resize button.
 	WID_CPR_FOOTER,          ///< Footer.
 	WID_CPR_ENABLE_CARGOES,  ///< Enable cargoes button.
 	WID_CPR_DISABLE_CARGOES, ///< Disable cargoes button.
 	WID_CPR_MATRIX,          ///< Cargo list.
 	WID_CPR_MATRIX_SCROLLBAR,///< Cargo list scrollbar.
 };
 /** Widget of the #PerformanceRatingDetailWindow class. */
 enum PerformanceRatingDetailsWidgets {
+enum PerformanceRatingDetailsWidgets : WidgetID {
 	WID_PRD_SCORE_FIRST, ///< First entry in the score list.
 	WID_PRD_SCORE_LAST = WID_PRD_SCORE_FIRST + (SCORE_END - SCORE_BEGIN) - 1, ///< Last entry in the score list.
 	WID_PRD_COMPANY_FIRST, ///< First company.
 	WID_PRD_COMPANY_LAST  = WID_PRD_COMPANY_FIRST + MAX_COMPANIES - 1, ///< Last company.
 };

src/widgets/group_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file group_widget.h Types related to the group widgets. */
 #ifndef WIDGETS_GROUP_WIDGET_H
 #define WIDGETS_GROUP_WIDGET_H
 /** Widgets of the #VehicleGroupWindow class. */
 enum GroupListWidgets {
+enum GroupListWidgets : WidgetID {
 	WID_GL_CAPTION,                  ///< Caption of the window.
 	WID_GL_GROUP_BY_ORDER,           ///< Group order.
 	WID_GL_GROUP_BY_DROPDOWN,        ///< Group by dropdown list.
 	WID_GL_SORT_BY_ORDER,            ///< Sort order.
 	WID_GL_SORT_BY_DROPDOWN,         ///< Sort by dropdown list.
 	WID_GL_FILTER_BY_CARGO,          ///< Filter vehicles by cargo type.

src/widgets/help_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
  /** @file help_widget.h Types related to the help window widgets. */
 #ifndef WIDGETS_HELP_WIDGET_H
 #define WIDGETS_HELP_WIDGET_H
 /** Widgets of the #HelpWindow class. */
 enum HelpWindowWidgets {
+enum HelpWindowWidgets : WidgetID {
 	WID_HW_README,
 	WID_HW_CHANGELOG,
 	WID_HW_KNOWN_BUGS,
 	WID_HW_LICENSE,
 	WID_HW_WEBSITE,
 	WID_HW_WIKI,

src/widgets/highscore_widget.h

➞

Show inline comments

@@ @@ -8,11 +8,11 @@ @@
 /** @file highscore_widget.h Types related to the highscore widgets. */
 #ifndef WIDGETS_HIGHSCORE_WIDGET_H
 #define WIDGETS_HIGHSCORE_WIDGET_H
 /** Widgets of the #EndGameHighScoreBaseWindow class and #HighScoreWindow class. */
 enum HighscoreWidgets {
+enum HighscoreWidgets : WidgetID {
 	WID_H_BACKGROUND, ///< Background of the window.
 };
 #endif /* WIDGETS_HIGHSCORE_WIDGET_H */

src/widgets/industry_widget.h

➞

Show inline comments

@@ @@ -8,46 +8,46 @@ @@
 /** @file industry_widget.h Types related to the industry widgets. */
 #ifndef WIDGETS_INDUSTRY_WIDGET_H
 #define WIDGETS_INDUSTRY_WIDGET_H
 /** Widgets of the #BuildIndustryWindow class. */
 enum DynamicPlaceIndustriesWidgets {
+enum DynamicPlaceIndustriesWidgets : WidgetID {
 	WID_DPI_SCENARIO_EDITOR_PANE,            ///< Pane containing SE-only widgets.
 	WID_DPI_REMOVE_ALL_INDUSTRIES_WIDGET,    ///< Remove all industries button.
 	WID_DPI_CREATE_RANDOM_INDUSTRIES_WIDGET, ///< Create random industries button.
 	WID_DPI_MATRIX_WIDGET,                   ///< Matrix of the industries.
 	WID_DPI_SCROLLBAR,                       ///< Scrollbar of the matrix.
 	WID_DPI_INFOPANEL,                       ///< Info panel about the industry.
 	WID_DPI_DISPLAY_WIDGET,                  ///< Display chain button.
 	WID_DPI_FUND_WIDGET,                     ///< Fund button.
 };
 /** Widgets of the #IndustryViewWindow class. */
 enum IndustryViewWidgets {
+enum IndustryViewWidgets : WidgetID {
 	WID_IV_CAPTION,  ///< Caption of the window.
 	WID_IV_VIEWPORT, ///< Viewport of the industry.
 	WID_IV_INFO,     ///< Info of the industry.
 	WID_IV_GOTO,     ///< Goto button.
 	WID_IV_DISPLAY,  ///< Display chain button.
 };
 /** Widgets of the #IndustryDirectoryWindow class. */
 enum IndustryDirectoryWidgets {
+enum IndustryDirectoryWidgets : WidgetID {
 	WID_ID_DROPDOWN_ORDER,       ///< Dropdown for the order of the sort.
 	WID_ID_DROPDOWN_CRITERIA,    ///< Dropdown for the criteria of the sort.
 	WID_ID_FILTER_BY_ACC_CARGO,  ///< Accepted cargo filter dropdown list.
 	WID_ID_FILTER_BY_PROD_CARGO, ///< Produced cargo filter dropdown list.
 	WID_ID_FILTER,               ///< Textbox to filter industry name.
 	WID_ID_INDUSTRY_LIST,        ///< Industry list.
 	WID_ID_HSCROLLBAR,           ///< Horizontal scrollbar of the list.
 	WID_ID_VSCROLLBAR,           ///< Vertical scrollbar of the list.
 };
 /** Widgets of the #IndustryCargoesWindow class */
 enum IndustryCargoesWidgets {
+enum IndustryCargoesWidgets : WidgetID {
 	WID_IC_CAPTION,        ///< Caption of the window.
 	WID_IC_NOTIFY,         ///< Row of buttons at the bottom.
 	WID_IC_PANEL,          ///< Panel that shows the chain.
 	WID_IC_SCROLLBAR,      ///< Scrollbar of the panel.
 	WID_IC_CARGO_DROPDOWN, ///< Select cargo dropdown.
 	WID_IC_IND_DROPDOWN,   ///< Select industry dropdown.

src/widgets/intro_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file intro_widget.h Types related to the intro widgets. */
 #ifndef WIDGETS_INTRO_WIDGET_H
 #define WIDGETS_INTRO_WIDGET_H
 /** Widgets of the #SelectGameWindow class. */
 enum SelectGameIntroWidgets {
+enum SelectGameIntroWidgets : WidgetID {
 	WID_SGI_GENERATE_GAME,         ///< Generate game button.
 	WID_SGI_LOAD_GAME,             ///< Load game button.
 	WID_SGI_PLAY_SCENARIO,         ///< Play scenario button.
 	WID_SGI_PLAY_HEIGHTMAP,        ///< Play heightmap button.
 	WID_SGI_EDIT_SCENARIO,         ///< Edit scenario button.
 	WID_SGI_PLAY_NETWORK,          ///< Play network button.

src/widgets/league_widget.h

➞

Show inline comments

@@ @@ -8,17 +8,17 @@ @@
 /** @file league_widget.h Types related to the graph widgets. */
 #ifndef WIDGETS_LEAGUE_WIDGET_H
 #define WIDGETS_LEAGUE_WIDGET_H
 /** Widget of the #PerformanceLeagueWindow class. */
 enum PerformanceLeagueWidgets {
+enum PerformanceLeagueWidgets : WidgetID {
 	WID_PLT_BACKGROUND, ///< Background of the window.
 };
 /** Widget of the #ScriptLeagueWindow class. */
 enum ScriptLeagueWidgets {
+enum ScriptLeagueWidgets : WidgetID {
 	WID_SLT_CAPTION,    ///< Caption of the window.
 	WID_SLT_BACKGROUND, ///< Background of the window.
 };
 #endif /* WIDGETS_LEAGUE_WIDGET_H */

src/widgets/link_graph_legend_widget.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #define WIDGETS_LINKGRAPH_LEGEND_WIDGET_H
 #include "../cargo_type.h"
 /** Widgets of the WC_LINKGRAPH_LEGEND. */
 enum LinkGraphLegendWidgets {
+enum LinkGraphLegendWidgets : WidgetID {
 	WID_LGL_CAPTION,           ///< Caption widget.
 	WID_LGL_SATURATION,        ///< Saturation legend.
 	WID_LGL_SATURATION_FIRST,
 	WID_LGL_SATURATION_LAST = WID_LGL_SATURATION_FIRST + 11,
 	WID_LGL_COMPANIES,         ///< Company selection widget.
 	WID_LGL_COMPANY_FIRST,

src/widgets/main_widget.h

➞

Show inline comments

@@ @@ -8,11 +8,11 @@ @@
 /** @file main_widget.h Types related to the main widgets. */
 #ifndef WIDGETS_MAIN_WIDGET_H
 #define WIDGETS_MAIN_WIDGET_H
 /** Widgets of the #MainWindow class. */
 enum MainWidgets {
+enum MainWidgets : WidgetID {
 	WID_M_VIEWPORT, ///< Main window viewport.
 };
 #endif /* WIDGETS_MAIN_WIDGET_H */

src/widgets/misc_widget.h

➞

Show inline comments

@@ @@ -8,49 +8,49 @@ @@
 /** @file misc_widget.h Types related to the misc widgets. */
 #ifndef WIDGETS_MISC_WIDGET_H
 #define WIDGETS_MISC_WIDGET_H
 /** Widgets of the #LandInfoWindow class. */
 enum LandInfoWidgets {
+enum LandInfoWidgets : WidgetID {
 	WID_LI_LOCATION, ///< Scroll to location.
 	WID_LI_BACKGROUND, ///< Background of the window.
 };
 /** Widgets of the #TooltipsWindow class. */
 enum ToolTipsWidgets {
+enum ToolTipsWidgets : WidgetID {
 	WID_TT_BACKGROUND, ///< Background of the window.
 };
 /** Widgets of the #AboutWindow class. */
 enum AboutWidgets {
+enum AboutWidgets : WidgetID {
 	WID_A_SCROLLING_TEXT, ///< The actually scrolling text.
 	WID_A_WEBSITE,        ///< URL of OpenTTD website.
 	WID_A_COPYRIGHT,      ///< Copyright string
 };
 /** Widgets of the #QueryStringWindow class. */
 enum QueryStringWidgets {
+enum QueryStringWidgets : WidgetID {
 	WID_QS_CAPTION, ///< Caption of the window.
 	WID_QS_TEXT,    ///< Text of the query.
 	WID_QS_WARNING, ///< Warning label about password security
 	WID_QS_DEFAULT, ///< Default button.
 	WID_QS_CANCEL,  ///< Cancel button.
 	WID_QS_OK,      ///< OK button.
 };
 /** Widgets of the #QueryWindow class. */
 enum QueryWidgets {
+enum QueryWidgets : WidgetID {
 	WID_Q_CAPTION, ///< Caption of the window.
 	WID_Q_TEXT,    ///< Text of the query.
 	WID_Q_NO,      ///< Yes button.
 	WID_Q_YES,     ///< No button.
 };
 /** Widgets of the #TextfileWindow class. */
 enum TextfileWidgets {
+enum TextfileWidgets : WidgetID {
 	WID_TF_CAPTION,      ///< The caption of the window.
 	WID_TF_NAVBACK,      ///< Navigate back button.
 	WID_TF_NAVFORWARD,   ///< Navigate forward button.
 	WID_TF_WRAPTEXT,     ///< Whether or not to wrap the text.
 	WID_TF_JUMPLIST,     ///< List to jump around the file.
 	WID_TF_SEL_JUMPLIST, ///< Selection to display the jump list or not.

src/widgets/music_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file music_widget.h Types related to the music widgets. */
 #ifndef WIDGETS_MUSIC_WIDGET_H
 #define WIDGETS_MUSIC_WIDGET_H
 /** Widgets of the #MusicTrackSelectionWindow class. */
 enum MusicTrackSelectionWidgets {
+enum MusicTrackSelectionWidgets : WidgetID {
 	WID_MTS_CAPTION,    ///< Window caption.
 	WID_MTS_LIST_LEFT,  ///< Left button.
 	WID_MTS_PLAYLIST,   ///< Playlist.
 	WID_MTS_LIST_RIGHT, ///< Right button.
 	WID_MTS_MUSICSET,   ///< Music set selection.
 	WID_MTS_ALL,        ///< All button.
@@ @@ -24,13 +24,13 @@ enum MusicTrackSelectionWidgets { @@
 	WID_MTS_CUSTOM1,    ///< Custom1 button.
 	WID_MTS_CUSTOM2,    ///< Custom2 button.
 	WID_MTS_CLEAR,      ///< Clear button.
 };
 /** Widgets of the #MusicWindow class. */
 enum MusicWidgets {
+enum MusicWidgets : WidgetID {
 	WID_M_PREV,        ///< Previous button.
 	WID_M_NEXT,        ///< Next button.
 	WID_M_STOP,        ///< Stop button.
 	WID_M_PLAY,        ///< Play button.
 	WID_M_SLIDERS,     ///< Sliders.
 	WID_M_MUSIC_VOL,   ///< Music volume.

src/widgets/network_chat_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file network_chat_widget.h Types related to the network chat widgets. */
 #ifndef WIDGETS_NETWORK_CHAT_WIDGET_H
 #define WIDGETS_NETWORK_CHAT_WIDGET_H
 /** Widgets of the #NetworkChatWindow class. */
 enum NetWorkChatWidgets {
+enum NetWorkChatWidgets : WidgetID {
 	WID_NC_CLOSE,       ///< Close button.
 	WID_NC_BACKGROUND,  ///< Background of the window.
 	WID_NC_DESTINATION, ///< Destination.
 	WID_NC_TEXTBOX,     ///< Textbox.
 	WID_NC_SENDBUTTON,  ///< Send button.
 };

src/widgets/network_content_widget.h

➞

Show inline comments

@@ @@ -10,20 +10,20 @@ @@
 #ifndef WIDGETS_NETWORK_CONTENT_WIDGET_H
 #define WIDGETS_NETWORK_CONTENT_WIDGET_H
 #include "../textfile_type.h"
 /** Widgets of the #NetworkContentDownloadStatusWindow class. */
 enum NetworkContentDownloadStatusWidgets {
+enum NetworkContentDownloadStatusWidgets : WidgetID {
 	WID_NCDS_PROGRESS_BAR,  ///< Simple progress bar.
 	WID_NCDS_PROGRESS_TEXT, ///< Text explaining what is happening.
 	WID_NCDS_CANCELOK,      ///< (Optional) Cancel/OK button.
 };
 /** Widgets of the #NetworkContentListWindow class. */
 enum NetworkContentListWidgets {
+enum NetworkContentListWidgets : WidgetID {
 	WID_NCL_BACKGROUND,     ///< Resize button.
 	WID_NCL_FILTER_CAPT,    ///< Caption for the filter editbox.
 	WID_NCL_FILTER,         ///< Filter editbox.
 	WID_NCL_CHECKBOX,       ///< Button above checkboxes.

src/widgets/network_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file network_widget.h Types related to the network widgets. */
 #ifndef WIDGETS_NETWORK_WIDGET_H
 #define WIDGETS_NETWORK_WIDGET_H
 /** Widgets of the #NetworkGameWindow class. */
 enum NetworkGameWidgets {
+enum NetworkGameWidgets : WidgetID {
 	WID_NG_MAIN,               ///< Main panel.
 	WID_NG_CLIENT_LABEL,       ///< Label in front of client name edit box.
 	WID_NG_CLIENT,             ///< Panel with editbox to set client name.
 	WID_NG_FILTER_LABEL,       ///< Label in front of the filter/search edit box.
 	WID_NG_FILTER,             ///< Panel with the edit box to enter the search text.
@@ @@ -46,13 +46,13 @@ enum NetworkGameWidgets { @@
 	WID_NG_ADD,                ///< 'Add server' button.
 	WID_NG_START,              ///< 'Start server' button.
 	WID_NG_CANCEL,             ///< 'Cancel' button.
 };
 /** Widgets of the #NetworkStartServerWindow class. */
 enum NetworkStartServerWidgets {
+enum NetworkStartServerWidgets : WidgetID {
 	WID_NSS_BACKGROUND,        ///< Background of the window.
 	WID_NSS_GAMENAME_LABEL,    ///< Label for the game name.
 	WID_NSS_GAMENAME,          ///< Background for editbox to set game name.
 	WID_NSS_SETPWD,            ///< 'Set password' button.
 	WID_NSS_CONNTYPE_LABEL,    ///< Label for 'connection type'.
 	WID_NSS_CONNTYPE_BTN,      ///< 'Connection type' droplist button.
@@ @@ -71,13 +71,13 @@ enum NetworkStartServerWidgets { @@
 	WID_NSS_PLAY_HEIGHTMAP,    ///< Play heightmap button.
 	WID_NSS_CANCEL,            ///< 'Cancel' button.
 };
 /** Widgets of the #NetworkClientListWindow class. */
 enum ClientListWidgets {
+enum ClientListWidgets : WidgetID {
 	WID_CL_PANEL,                      ///< Panel of the window.
 	WID_CL_SERVER_SELECTOR,            ///< Selector to hide the server frame.
 	WID_CL_SERVER_NAME,                ///< Server name.
 	WID_CL_SERVER_NAME_EDIT,           ///< Edit button for server name.
 	WID_CL_SERVER_VISIBILITY,          ///< Server visibility.
 	WID_CL_SERVER_INVITE_CODE,         ///< Invite code for this server.
@@ @@ -88,40 +88,40 @@ enum ClientListWidgets { @@
 	WID_CL_SCROLLBAR,                  ///< Scrollbar for company/client list.
 	WID_CL_COMPANY_JOIN,               ///< Used for QueryWindow when a company has a password.
 	WID_CL_CLIENT_COMPANY_COUNT,       ///< Count of clients and companies.
 };
 /** Widgets of the #NetworkJoinStatusWindow class. */
 enum NetworkJoinStatusWidgets {
+enum NetworkJoinStatusWidgets : WidgetID {
 	WID_NJS_PROGRESS_BAR,  ///< Simple progress bar.
 	WID_NJS_PROGRESS_TEXT, ///< Text explaining what is happening.
 	WID_NJS_CANCELOK,      ///< Cancel / OK button.
 };
 /** Widgets of the #NetworkCompanyPasswordWindow class. */
 enum NetworkCompanyPasswordWidgets {
+enum NetworkCompanyPasswordWidgets : WidgetID {
 	WID_NCP_BACKGROUND,               ///< Background of the window.
 	WID_NCP_LABEL,                    ///< Label in front of the password field.
 	WID_NCP_PASSWORD,                 ///< Input field for the password.
 	WID_NCP_SAVE_AS_DEFAULT_PASSWORD, ///< Toggle 'button' for saving the current password as default password.
 	WID_NCP_WARNING,                  ///< Warning text about password security
 	WID_NCP_CANCEL,                   ///< Close the window without changing anything.
 	WID_NCP_OK,                       ///< Safe the password etc.
 };
 /** Widgets of the #NetworkAskRelayWindow class. */
 enum NetworkAskRelayWidgets {
+enum NetworkAskRelayWidgets : WidgetID {
 	WID_NAR_CAPTION,    ///< Caption of the window.
 	WID_NAR_TEXT,       ///< Text in the window.
 	WID_NAR_NO,         ///< "No" button.
 	WID_NAR_YES_ONCE,   ///< "Yes, once" button.
 	WID_NAR_YES_ALWAYS, ///< "Yes, always" button.
 };
 /** Widgets of the #NetworkAskSurveyWindow class. */
 enum NetworkAskSurveyWidgets {
+enum NetworkAskSurveyWidgets : WidgetID {
 	WID_NAS_CAPTION,    ///< Caption of the window.
 	WID_NAS_TEXT,       ///< Text in the window.
 	WID_NAS_PREVIEW,    ///< "Preview" button.
 	WID_NAS_LINK,       ///< "Details & Privacy" button.
 	WID_NAS_NO,         ///< "No" button.
 	WID_NAS_YES,        ///< "Yes" button.

src/widgets/newgrf_debug_widget.h

➞

Show inline comments

@@ @@ -8,24 +8,24 @@ @@
 /** @file newgrf_debug_widget.h Types related to the newgrf debug widgets. */
 #ifndef WIDGETS_NEWGRF_DEBUG_WIDGET_H
 #define WIDGETS_NEWGRF_DEBUG_WIDGET_H
 /** Widgets of the #NewGRFInspectWindow class. */
 enum NewGRFInspectWidgets {
+enum NewGRFInspectWidgets : WidgetID {
 	WID_NGRFI_CAPTION,   ///< The caption bar of course.
 	WID_NGRFI_PARENT,    ///< Inspect the parent.
 	WID_NGRFI_VEH_PREV,  ///< Go to previous vehicle in chain.
 	WID_NGRFI_VEH_NEXT,  ///< Go to next vehicle in chain.
 	WID_NGRFI_VEH_CHAIN, ///< Display for vehicle chain.
 	WID_NGRFI_MAINPANEL, ///< Panel widget containing the actual data.
 	WID_NGRFI_SCROLLBAR, ///< Scrollbar.
 };
 /** Widgets of the #SpriteAlignerWindow class. */
 enum SpriteAlignerWidgets {
+enum SpriteAlignerWidgets : WidgetID {
 	WID_SA_CAPTION,     ///< Caption of the window.
 	WID_SA_PREVIOUS,    ///< Skip to the previous sprite.
 	WID_SA_GOTO,        ///< Go to a given sprite.
 	WID_SA_NEXT,        ///< Skip to the next sprite.
 	WID_SA_UP,          ///< Move the sprite up.
 	WID_SA_LEFT,        ///< Move the sprite to the left.

src/widgets/newgrf_widget.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #define WIDGETS_NEWGRF_WIDGET_H
 #include "../newgrf_config.h"
 #include "../textfile_type.h"
 /** Widgets of the #NewGRFParametersWindow class. */
 enum NewGRFParametersWidgets {
+enum NewGRFParametersWidgets : WidgetID {
 	WID_NP_CAPTION,          ///< Caption of the window.
 	WID_NP_SHOW_NUMPAR,      ///< #NWID_SELECTION to optionally display #WID_NP_NUMPAR.
 	WID_NP_NUMPAR_DEC,       ///< Button to decrease number of parameters.
 	WID_NP_NUMPAR_INC,       ///< Button to increase number of parameters.
 	WID_NP_NUMPAR,           ///< Optional number of parameters.
 	WID_NP_NUMPAR_TEXT,      ///< Text description.
@@ @@ -29,13 +29,13 @@ enum NewGRFParametersWidgets { @@
 	WID_NP_DESCRIPTION,      ///< Multi-line description of a parameter.
 	WID_NP_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
 };
 /** Widgets of the #NewGRFWindow class. */
 enum NewGRFStateWidgets {
+enum NewGRFStateWidgets : WidgetID {
 	WID_NS_PRESET_LIST,       ///< Active NewGRF preset.
 	WID_NS_PRESET_SAVE,       ///< Save list of active NewGRFs as presets.
 	WID_NS_PRESET_DELETE,     ///< Delete active preset.
 	WID_NS_ADD,               ///< Add NewGRF to active list.
 	WID_NS_REMOVE,            ///< Remove NewGRF from active list.
 	WID_NS_MOVE_UP,           ///< Move NewGRF up in active list.
@@ @@ -60,21 +60,21 @@ enum NewGRFStateWidgets { @@
 	WID_NS_CONTENT_DOWNLOAD2, ///< Open content download (active NewGRFs).
 	WID_NS_SHOW_REMOVE,       ///< Select active list buttons (0 = normal, 1 = simple layout).
 	WID_NS_SHOW_APPLY,        ///< Select display of the buttons below the 'details'.
 };
 /** Widgets of the #SavePresetWindow class. */
 enum SavePresetWidgets {
+enum SavePresetWidgets : WidgetID {
 	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 {
+enum ScanProgressWidgets : WidgetID {
 	WID_SP_PROGRESS_BAR,  ///< Simple progress bar.
 	WID_SP_PROGRESS_TEXT, ///< Text explaining what is happening.
 };
 #endif /* WIDGETS_NEWGRF_WIDGET_H */

src/widgets/news_widget.h

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
 #ifndef WIDGETS_NEWS_WIDGET_H
 #define WIDGETS_NEWS_WIDGET_H
 #include "../news_type.h"
 /** Widgets of the #NewsWindow class. */
 enum NewsWidgets {
+enum NewsWidgets : WidgetID {
 	WID_N_PANEL,       ///< Panel of the window.
 	WID_N_TITLE,       ///< Title of the company news.
 	WID_N_HEADLINE,    ///< The news headline.
 	WID_N_CLOSEBOX,    ///< Close the window.
 	WID_N_DATE,        ///< Date of the news item.
 	WID_N_CAPTION,     ///< Title bar of the window. Only used in small news items.
@@ @@ -32,13 +32,13 @@ enum NewsWidgets { @@
 	WID_N_VEH_SPR,     ///< Graphical display of the new vehicle.
 	WID_N_VEH_INFO,    ///< Some technical data of the new vehicle.
 	WID_N_SHOW_GROUP,  ///< Show vehicle's group
 };
 /** Widgets of the #MessageHistoryWindow class. */
 enum MessageHistoryWidgets {
+enum MessageHistoryWidgets : WidgetID {
 	WID_MH_STICKYBOX,  ///< Stickybox.
 	WID_MH_BACKGROUND, ///< Background of the window.
 	WID_MH_SCROLLBAR,  ///< Scrollbar for the list.
 };
 #endif /* WIDGETS_NEWS_WIDGET_H */

src/widgets/object_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file object_widget.h Types related to the object widgets. */
 #ifndef WIDGETS_OBJECT_WIDGET_H
 #define WIDGETS_OBJECT_WIDGET_H
 /** Widgets of the #BuildObjectWindow class. */
 enum BuildObjectWidgets {
+enum BuildObjectWidgets : WidgetID {
 	WID_BO_FILTER,         ///< The filter text box for the object list.
 	WID_BO_CLASS_LIST,     ///< The list with classes.
 	WID_BO_SCROLLBAR,      ///< The scrollbar associated with the list.
 	WID_BO_OBJECT_MATRIX,  ///< The matrix with preview sprites.
 	WID_BO_OBJECT_SPRITE,  ///< A preview sprite of the object.
 	WID_BO_OBJECT_NAME,    ///< The name of the selected object.

src/widgets/order_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file order_widget.h Types related to the order widgets. */
 #ifndef WIDGETS_ORDER_WIDGET_H
 #define WIDGETS_ORDER_WIDGET_H
 /** Widgets of the #OrdersWindow class. */
 enum OrderWidgets {
+enum OrderWidgets : WidgetID {
 	WID_O_CAPTION,                   ///< Caption of the window.
 	WID_O_TIMETABLE_VIEW,            ///< Toggle timetable view.
 	WID_O_ORDER_LIST,                ///< Order list panel.
 	WID_O_SCROLLBAR,                 ///< Order list scrollbar.
 	WID_O_SKIP,                      ///< Skip current order.
 	WID_O_DELETE,                    ///< Delete selected order.

src/widgets/osk_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file osk_widget.h Types related to the osk widgets. */
 #ifndef WIDGETS_OSK_WIDGET_H
 #define WIDGETS_OSK_WIDGET_H
 /** Widgets of the #OskWindow class. */
 enum OnScreenKeyboardWidgets {
+enum OnScreenKeyboardWidgets : WidgetID {
 	WID_OSK_CAPTION,   ///< Caption of window.
 	WID_OSK_TEXT,      ///< Edit box.
 	WID_OSK_CANCEL,    ///< Cancel key.
 	WID_OSK_OK,        ///< Ok key.
 	WID_OSK_BACKSPACE, ///< Backspace key.
 	WID_OSK_SPECIAL,   ///< Special key (at keyboards often used for tab key).

src/widgets/rail_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file rail_widget.h Types related to the rail widgets. */
 #ifndef WIDGETS_RAIL_WIDGET_H
 #define WIDGETS_RAIL_WIDGET_H
 /** Widgets of the #BuildRailToolbarWindow class. */
 enum RailToolbarWidgets {
+enum RailToolbarWidgets : WidgetID {
 	/* Name starts with RA instead of R, because of collision with RoadToolbarWidgets */
 	WID_RAT_CAPTION,        ///< Caption of the window.
 	WID_RAT_BUILD_NS,       ///< Build rail along the game view Y axis.
 	WID_RAT_BUILD_X,        ///< Build rail along the game grid X axis.
 	WID_RAT_BUILD_EW,       ///< Build rail along the game view X axis.
 	WID_RAT_BUILD_Y,        ///< Build rail along the game grid Y axis.
@@ @@ -30,13 +30,13 @@ enum RailToolbarWidgets { @@
 	WID_RAT_CONVERT_RAIL,   ///< Convert other rail to this type.
 	INVALID_WID_RAT = -1,
 };
 /** Widgets of the #BuildRailStationWindow class. */
 enum BuildRailStationWidgets {
+enum BuildRailStationWidgets : WidgetID {
 	/* Name starts with BRA instead of BR, because of collision with BuildRoadStationWidgets */
 	WID_BRAS_PLATFORM_DIR_X,       ///< Button to select '/' view.
 	WID_BRAS_PLATFORM_DIR_Y,       ///< Button to select '\' view.
 	WID_BRAS_PLATFORM_NUM_1,       ///< Button to select stations with a single platform.
 	WID_BRAS_PLATFORM_NUM_2,       ///< Button to select stations with 2 platforms.
@@ @@ -76,13 +76,13 @@ enum BuildRailStationWidgets { @@
 	WID_BRAS_PLATFORM_NUM_BEGIN = WID_BRAS_PLATFORM_NUM_1 - 1, ///< Helper for determining the chosen platform width.
 	WID_BRAS_PLATFORM_LEN_BEGIN = WID_BRAS_PLATFORM_LEN_1 - 1, ///< Helper for determining the chosen platform length.
 };
 /** Widgets of the #BuildSignalWindow class. */
 enum BuildSignalWidgets {
+enum BuildSignalWidgets : WidgetID {
 	WID_BS_CAPTION,            ///< Caption for the Signal Selection window.
 	WID_BS_TOGGLE_SIZE,        ///< Toggle showing advanced signal types.
 	WID_BS_SEMAPHORE_NORM,     ///< Build a semaphore normal block signal.
 	WID_BS_SEMAPHORE_ENTRY,    ///< Build a semaphore entry block signal.
 	WID_BS_SEMAPHORE_EXIT,     ///< Build a semaphore exit block signal.
 	WID_BS_SEMAPHORE_COMBO,    ///< Build a semaphore combo block signal.
@@ @@ -106,22 +106,22 @@ enum BuildSignalWidgets { @@
 	WID_BS_ELECTRIC_EXIT_SEL,   ///< NWID_SELECTION for WID_BS_ELECTRIC_EXIT.
 	WID_BS_SEMAPHORE_COMBO_SEL, ///< NWID_SELECTION for WID_BS_SEMAPHORE_COMBO.
 	WID_BS_ELECTRIC_COMBO_SEL,  ///< NWID_SELECTION for WID_BS_ELECTRIC_COMBO.
 };
 /** Widgets of the #BuildRailDepotWindow class. */
 enum BuildRailDepotWidgets {
+enum BuildRailDepotWidgets : WidgetID {
 	/* Name starts with BRA instead of BR, because of collision with BuildRoadDepotWidgets */
 	WID_BRAD_DEPOT_NE, ///< Build a depot with the entrance in the north east.
 	WID_BRAD_DEPOT_SE, ///< Build a depot with the entrance in the south east.
 	WID_BRAD_DEPOT_SW, ///< Build a depot with the entrance in the south west.
 	WID_BRAD_DEPOT_NW, ///< Build a depot with the entrance in the north west.
 };
 /** Widgets of the #BuildRailWaypointWindow class. */
 enum BuildRailWaypointWidgets {
+enum BuildRailWaypointWidgets : WidgetID {
 	WID_BRW_FILTER,          ///< Text filter.
 	WID_BRW_WAYPOINT_MATRIX, ///< Matrix with waypoints.
 	WID_BRW_WAYPOINT,        ///< A single waypoint.
 	WID_BRW_SCROLL,          ///< Scrollbar for the matrix.
 	WID_BRW_NAME,            ///< Name of selected waypoint.
 };

src/widgets/road_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file road_widget.h Types related to the road widgets. */
 #ifndef WIDGETS_ROAD_WIDGET_H
 #define WIDGETS_ROAD_WIDGET_H
 /** Widgets of the #BuildRoadToolbarWindow class. */
 enum RoadToolbarWidgets {
+enum RoadToolbarWidgets : WidgetID {
 	/* Name starts with RO instead of R, because of collision with RailToolbarWidgets */
 	WID_ROT_CAPTION,        ///< Caption of the window
 	WID_ROT_ROAD_X,         ///< Build road in x-direction.
 	WID_ROT_ROAD_Y,         ///< Build road in y-direction.
 	WID_ROT_AUTOROAD,       ///< Autorail.
 	WID_ROT_DEMOLISH,       ///< Demolish.
@@ @@ -28,23 +28,23 @@ enum RoadToolbarWidgets { @@
 	WID_ROT_CONVERT_ROAD,   ///< Convert road.
 	INVALID_WID_ROT = -1,
 };
 /** Widgets of the #BuildRoadDepotWindow class. */
 enum BuildRoadDepotWidgets {
+enum BuildRoadDepotWidgets : WidgetID {
 	/* Name starts with BRO instead of BR, because of collision with BuildRailDepotWidgets */
 	WID_BROD_CAPTION,   ///< Caption of the window.
 	WID_BROD_DEPOT_NE,  ///< Depot with NE entry.
 	WID_BROD_DEPOT_SE,  ///< Depot with SE entry.
 	WID_BROD_DEPOT_SW,  ///< Depot with SW entry.
 	WID_BROD_DEPOT_NW,  ///< Depot with NW entry.
 };
 /** Widgets of the #BuildRoadStationWindow class. */
 enum BuildRoadStationWidgets {
+enum BuildRoadStationWidgets : WidgetID {
 	/* Name starts with BRO instead of BR, because of collision with BuildRailStationWidgets */
 	WID_BROS_CAPTION,                ///< Caption of the window.
 	WID_BROS_STATION_NE,             ///< Terminal station with NE entry.
 	WID_BROS_STATION_SE,             ///< Terminal station with SE entry.
 	WID_BROS_STATION_SW,             ///< Terminal station with SW entry.
 	WID_BROS_STATION_NW,             ///< Terminal station with NW entry.

src/widgets/screenshot_widget.h

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 #ifndef WIDGETS_SCREENSHOT_WIDGET_H
 #define WIDGETS_SCREENSHOT_WIDGET_H
 /** Widgets of the #ScreenshotWindow class. */
 enum ScreenshotWindowWidgets {
+enum ScreenshotWindowWidgets : WidgetID {
 	WID_SC_TAKE,             ///< Button for taking a normal screenshot
 	WID_SC_TAKE_ZOOMIN,      ///< Button for taking a zoomed in screenshot
 	WID_SC_TAKE_DEFAULTZOOM, ///< Button for taking a screenshot at normal zoom
 	WID_SC_TAKE_WORLD,       ///< Button for taking a screenshot of the whole world
 	WID_SC_TAKE_HEIGHTMAP,   ///< Button for taking a heightmap "screenshot"
 	WID_SC_TAKE_MINIMAP,     ///< Button for taking a minimap screenshot

src/widgets/script_widget.h

➞

Show inline comments

@@ @@ -10,34 +10,34 @@ @@
 #ifndef WIDGETS_SCRIPT_WIDGET_H
 #define WIDGETS_SCRIPT_WIDGET_H
 #include "../company_type.h"
 /** Widgets of the #ScriptListWindow class. */
 enum ScriptListWidgets {
+enum ScriptListWidgets : WidgetID {
 	WID_SCRL_CAPTION,   ///< Caption of the window.
 	WID_SCRL_LIST,      ///< The matrix with all available Scripts.
 	WID_SCRL_SCROLLBAR, ///< Scrollbar next to the Script list.
 	WID_SCRL_INFO_BG,   ///< Panel to draw some Script information on.
 	WID_SCRL_ACCEPT,    ///< Accept button.
 	WID_SCRL_CANCEL,    ///< Cancel button.
 };
 /** Widgets of the #ScriptSettingsWindow class. */
 enum ScriptSettingsWidgets {
+enum ScriptSettingsWidgets : WidgetID {
 	WID_SCRS_CAPTION,    ///< Caption of the window.
 	WID_SCRS_BACKGROUND, ///< Panel to draw the settings on.
 	WID_SCRS_SCROLLBAR,  ///< Scrollbar to scroll through all settings.
 	WID_SCRS_ACCEPT,     ///< Accept button.
 	WID_SCRS_RESET,      ///< Reset button.
 	WID_SCRS_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
 };
 /** Widgets of the #ScriptDebugWindow class. */
 enum ScriptDebugWidgets {
+enum ScriptDebugWidgets : WidgetID {
 	WID_SCRD_VIEW,                 ///< The row of company buttons.
 	WID_SCRD_NAME_TEXT,            ///< Name of the current selected.
 	WID_SCRD_SETTINGS,             ///< Settings button.
 	WID_SCRD_SCRIPT_GAME,          ///< Game Script button.
 	WID_SCRD_RELOAD_TOGGLE,        ///< Reload button.
 	WID_SCRD_LOG_PANEL,            ///< Panel where the log is in.

src/widgets/settings_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file settings_widget.h Types related to the settings widgets. */
 #ifndef WIDGETS_SETTINGS_WIDGET_H
 #define WIDGETS_SETTINGS_WIDGET_H
 /** Widgets of the #GameOptionsWindow class. */
 enum GameOptionsWidgets {
+enum GameOptionsWidgets : WidgetID {
 	WID_GO_TAB_GENERAL,            ///< General tab.
 	WID_GO_TAB_GRAPHICS,           ///< Graphics tab.
 	WID_GO_TAB_SOUND,              ///< Sound tab.
 	WID_GO_TAB_SELECTION,          ///< Background of the tab selection.
 	WID_GO_CURRENCY_DROPDOWN,      ///< Currency dropdown.
 	WID_GO_DISTANCE_DROPDOWN,      ///< Measuring unit dropdown.
@@ @@ -51,13 +51,13 @@ enum GameOptionsWidgets { @@
 	WID_GO_SURVEY_PARTICIPATE_BUTTON, ///< Toggle for participating in the automated survey.
 	WID_GO_SURVEY_LINK_BUTTON,     ///< Button to open browser to go to the survey website.
 	WID_GO_SURVEY_PREVIEW_BUTTON,  ///< Button to open a preview window with the survey results
 };
 /** Widgets of the #GameSettingsWindow class. */
 enum GameSettingsWidgets {
+enum GameSettingsWidgets : WidgetID {
 	WID_GS_FILTER,             ///< Text filter.
 	WID_GS_OPTIONSPANEL,       ///< Panel widget containing the option lists.
 	WID_GS_SCROLLBAR,          ///< Scrollbar.
 	WID_GS_HELP_TEXT,          ///< Information area to display help text of the selected option.
 	WID_GS_EXPAND_ALL,         ///< Expand all button.
 	WID_GS_COLLAPSE_ALL,       ///< Collapse all button.
@@ @@ -68,13 +68,13 @@ enum GameSettingsWidgets { @@
 	WID_GS_TYPE_DROPDOWN,      ///< The drop down box to choose client/game/company/all settings
 	WID_GS_SETTING_DROPDOWN = -1, ///< Dynamically created dropdown for changing setting value.
 };
 /** Widgets of the #CustomCurrencyWindow class. */
 enum CustomCurrencyWidgets {
+enum CustomCurrencyWidgets : WidgetID {
 	WID_CC_RATE_DOWN,      ///< Down button.
 	WID_CC_RATE_UP,        ///< Up button.
 	WID_CC_RATE,           ///< Rate of currency.
 	WID_CC_SEPARATOR_EDIT, ///< Separator edit button.
 	WID_CC_SEPARATOR,      ///< Current separator.
 	WID_CC_PREFIX_EDIT,    ///< Prefix edit button.

src/widgets/sign_widget.h

➞

Show inline comments

@@ @@ -8,24 +8,24 @@ @@
 /** @file sign_widget.h Types related to the sign widgets. */
 #ifndef WIDGETS_SIGN_WIDGET_H
 #define WIDGETS_SIGN_WIDGET_H
 /** Widgets of the #SignListWindow class. */
 enum SignListWidgets {
+enum SignListWidgets : WidgetID {
 	/* Name starts with SI instead of S, because of collision with SaveLoadWidgets */
 	WID_SIL_CAPTION,               ///< Caption of the window.
 	WID_SIL_LIST,                  ///< List of signs.
 	WID_SIL_SCROLLBAR,             ///< Scrollbar of list.
 	WID_SIL_FILTER_TEXT,           ///< Text box for typing a filter string.
 	WID_SIL_FILTER_MATCH_CASE_BTN, ///< Button to toggle if case sensitive filtering should be used.
 	WID_SIL_FILTER_ENTER_BTN,      ///< Scroll to first sign.
 };
 /** Widgets of the #SignWindow class. */
 enum QueryEditSignWidgets {
+enum QueryEditSignWidgets : WidgetID {
 	WID_QES_CAPTION,  ///< Caption of the window.
 	WID_QES_LOCATION, ///< Scroll to sign location.
 	WID_QES_TEXT,     ///< Text of the query.
 	WID_QES_OK,       ///< OK button.
 	WID_QES_CANCEL,   ///< Cancel button.
 	WID_QES_DELETE,   ///< Delete button.

src/widgets/smallmap_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file smallmap_widget.h Types related to the smallmap widgets. */
 #ifndef WIDGETS_SMALLMAP_WIDGET_H
 #define WIDGETS_SMALLMAP_WIDGET_H
 /** Widgets of the #SmallMapWindow class. */
 enum SmallMapWidgets {
+enum SmallMapWidgets : WidgetID {
 	WID_SM_CAPTION,        ///< Caption of the window.
 	WID_SM_MAP_BORDER,     ///< Border around the smallmap.
 	WID_SM_MAP,            ///< Panel containing the smallmap.
 	WID_SM_LEGEND,         ///< Bottom panel to display smallmap legends.
 	WID_SM_BLANK,          ///< Empty button as placeholder.
 	WID_SM_ZOOM_IN,        ///< Button to zoom in one step.

src/widgets/station_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file station_widget.h Types related to the station widgets. */
 #ifndef WIDGETS_STATION_WIDGET_H
 #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
 	WID_SV_SORT_ORDER,         ///< 'Sort order' button
 	WID_SV_SORT_BY,            ///< 'Sort by' button
 	WID_SV_WAITING,            ///< List of waiting cargo.
@@ @@ -29,13 +29,13 @@ enum StationViewWidgets { @@
 	WID_SV_SHIPS,              ///< List of scheduled ships button.
 	WID_SV_PLANES,             ///< List of scheduled planes button.
 	WID_SV_CATCHMENT,          ///< Toggle catchment area highlight.
 };
 /** 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.
 	WID_STL_SCROLLBAR,      ///< Scrollbar next to the main panel.
 	/* Vehicletypes need to be in order of StationFacility due to bit magic */
@@ @@ -53,13 +53,13 @@ enum StationListWidgets { @@
 	WID_STL_SORTDROPBTN,    ///< Dropdown button.
 	WID_STL_CARGOSTART,     ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets).
 };
 /** 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.
 };
 #endif /* WIDGETS_STATION_WIDGET_H */

src/widgets/statusbar_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file statusbar_widget.h Types related to the statusbar widgets. */
 #ifndef WIDGETS_STATUSBAR_WIDGET_H
 #define WIDGETS_STATUSBAR_WIDGET_H
 /** Widgets of the #StatusBarWindow class. */
 enum StatusbarWidgets {
+enum StatusbarWidgets : WidgetID {
 	WID_S_LEFT,   ///< Left part of the statusbar; date is shown there.
 	WID_S_MIDDLE, ///< Middle part; current news or company name or *** SAVING *** or *** PAUSED ***.
 	WID_S_RIGHT,  ///< Right part; bank balance.
 };
 #endif /* WIDGETS_STATUSBAR_WIDGET_H */

src/widgets/story_widget.h

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file story_widget.h Types related to the story widgets. */
 #ifndef WIDGETS_STORY_WIDGET_H
 #define WIDGETS_STORY_WIDGET_H
 /** Widgets of the #GoalListWindow class. */
 enum StoryBookWidgets {
+enum StoryBookWidgets : WidgetID {
 	WID_SB_CAPTION,   ///< Caption of the window.
 	WID_SB_SEL_PAGE,  ///< Page selector.
 	WID_SB_PAGE_PANEL,///< Page body.
 	WID_SB_SCROLLBAR, ///< Scrollbar of the goal list.
 	WID_SB_PREV_PAGE, ///< Prev button.
 	WID_SB_NEXT_PAGE, ///< Next button.

src/widgets/subsidy_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file subsidy_widget.h Types related to the subsidy widgets. */
 #ifndef WIDGETS_SUBSIDY_WIDGET_H
 #define WIDGETS_SUBSIDY_WIDGET_H
 /** Widgets of the #SubsidyListWindow class. */
 enum SubsidyListWidgets {
+enum SubsidyListWidgets : WidgetID {
 	/* Name starts with SU instead of S, because of collision with SaveLoadWidgets. */
 	WID_SUL_PANEL,     ///< Main panel of window.
 	WID_SUL_SCROLLBAR, ///< Scrollbar of panel.
 };
 #endif /* WIDGETS_SUBSIDY_WIDGET_H */

src/widgets/terraform_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file terraform_widget.h Types related to the terraform widgets. */
 #ifndef WIDGETS_TERRAFORM_WIDGET_H
 #define WIDGETS_TERRAFORM_WIDGET_H
 /** Widgets of the #TerraformToolbarWindow class. */
 enum TerraformToolbarWidgets {
+enum TerraformToolbarWidgets : WidgetID {
 	WID_TT_SHOW_PLACE_OBJECT,                 ///< Should the place object button be shown?
 	WID_TT_BUTTONS_START,                     ///< Start of pushable buttons.
 	WID_TT_LOWER_LAND = WID_TT_BUTTONS_START, ///< Lower land button.
 	WID_TT_RAISE_LAND,                        ///< Raise land button.
 	WID_TT_LEVEL_LAND,                        ///< Level land button.
 	WID_TT_DEMOLISH,                          ///< Demolish aka dynamite button.
@@ @@ -24,13 +24,13 @@ enum TerraformToolbarWidgets { @@
 	WID_TT_PLACE_OBJECT,                      ///< Place object button.
 	INVALID_WID_TT = -1,
 };
 /** Widgets of the #ScenarioEditorLandscapeGenerationWindow class. */
 enum EditorTerraformToolbarWidgets {
+enum EditorTerraformToolbarWidgets : WidgetID {
 	WID_ETT_SHOW_PLACE_DESERT,                   ///< Should the place desert button be shown?
 	WID_ETT_START,                               ///< Used for iterations.
 	WID_ETT_DOTS = WID_ETT_START,                ///< Invisible widget for rendering the terraform size on.
 	WID_ETT_BUTTONS_START,                       ///< Start of pushable buttons.
 	WID_ETT_DEMOLISH = WID_ETT_BUTTONS_START,    ///< Demolish aka dynamite button.
 	WID_ETT_LOWER_LAND,                          ///< Lower land button.

src/widgets/timetable_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file timetable_widget.h Types related to the timetable widgets. */
 #ifndef WIDGETS_TIMETABLE_WIDGET_H
 #define WIDGETS_TIMETABLE_WIDGET_H
 /** Widgets of the #TimetableWindow class. */
 enum VehicleTimetableWidgets {
+enum VehicleTimetableWidgets : WidgetID {
 	WID_VT_CAPTION,                     ///< Caption of the window.
 	WID_VT_ORDER_VIEW,                  ///< Order view.
 	WID_VT_TIMETABLE_PANEL,             ///< Timetable panel.
 	WID_VT_ARRIVAL_DEPARTURE_PANEL,     ///< Panel with the expected/scheduled arrivals.
 	WID_VT_SCROLLBAR,                   ///< Scrollbar for the panel.
 	WID_VT_SUMMARY_PANEL,               ///< Summary panel.

src/widgets/toolbar_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file toolbar_widget.h Types related to the toolbar widgets. */
 #ifndef WIDGETS_TOOLBAR_WIDGET_H
 #define WIDGETS_TOOLBAR_WIDGET_H
 /** Widgets of the #MainToolbarWindow class. */
 enum ToolbarNormalWidgets {
+enum ToolbarNormalWidgets : WidgetID {
 	WID_TN_PAUSE,         ///< Pause the game.
 	WID_TN_FAST_FORWARD,  ///< Fast forward the game.
 	WID_TN_SETTINGS,      ///< Settings menu.
 	WID_TN_SAVE,          ///< Save menu.
 	WID_TN_SMALL_MAP,     ///< Small map menu.
 	WID_TN_TOWNS,         ///< Town menu.
@@ @@ -46,13 +46,13 @@ enum ToolbarNormalWidgets { @@
 	WID_TN_HELP,          ///< Help menu.
 	WID_TN_SWITCH_BAR,    ///< Only available when toolbar has been split to switch between different subsets.
 	WID_TN_END,           ///< Helper for knowing the amount of widgets.
 };
 /** Widgets of the #ScenarioEditorToolbarWindow class. */
 enum ToolbarEditorWidgets {
+enum ToolbarEditorWidgets : WidgetID {
 	WID_TE_PAUSE,         ///< Pause the game.
 	WID_TE_FAST_FORWARD,  ///< Fast forward the game.
 	WID_TE_SETTINGS,      ///< Settings menu.
 	WID_TE_SAVE,          ///< Save menu.
 	WID_TE_SPACER,        ///< Spacer with "scenario editor" text.
 	WID_TE_DATE,          ///< The date of the scenario.

src/widgets/town_widget.h

➞

Show inline comments

@@ @@ -8,47 +8,47 @@ @@
 /** @file town_widget.h Types related to the town widgets. */
 #ifndef WIDGETS_TOWN_WIDGET_H
 #define WIDGETS_TOWN_WIDGET_H
 /** Widgets of the #TownDirectoryWindow class. */
 enum TownDirectoryWidgets {
+enum TownDirectoryWidgets : WidgetID {
 	WID_TD_SORT_ORDER,       ///< Direction of sort dropdown.
 	WID_TD_SORT_CRITERIA,    ///< Criteria of sort dropdown.
 	WID_TD_FILTER,           ///< Filter of name.
 	WID_TD_LIST,             ///< List of towns.
 	WID_TD_SCROLLBAR,        ///< Scrollbar for the town list.
 	WID_TD_WORLD_POPULATION, ///< The world's population.
 };
 /** Widgets of the #TownAuthorityWindow class. */
 enum TownAuthorityWidgets {
+enum TownAuthorityWidgets : WidgetID {
 	WID_TA_CAPTION,      ///< Caption of window.
 	WID_TA_ZONE_BUTTON,  ///< Turn on/off showing local authority zone.
 	WID_TA_RATING_INFO,  ///< Overview with ratings for each company.
 	WID_TA_COMMAND_LIST, ///< List of commands for the player.
 	WID_TA_SCROLLBAR,    ///< Scrollbar of the list of commands.
 	WID_TA_ACTION_INFO,  ///< Additional information about the action.
 	WID_TA_EXECUTE,      ///< Do-it button.
 };
 /** Widgets of the #TownViewWindow class. */
 enum TownViewWidgets {
+enum TownViewWidgets : WidgetID {
 	WID_TV_CAPTION,        ///< Caption of window.
 	WID_TV_VIEWPORT,       ///< View of the center of the town.
 	WID_TV_INFO,           ///< General information about the town.
 	WID_TV_CENTER_VIEW,    ///< Center the main view on this town.
 	WID_TV_SHOW_AUTHORITY, ///< Show the town authority window.
 	WID_TV_CHANGE_NAME,    ///< Change the name of this town.
 	WID_TV_CATCHMENT,      ///< Toggle catchment area highlight.
 	WID_TV_EXPAND,         ///< Expand this town (scenario editor only).
 	WID_TV_DELETE,         ///< Delete this town (scenario editor only).
 };
 /** Widgets of the #FoundTownWindow class. */
 enum TownFoundingWidgets {
+enum TownFoundingWidgets : WidgetID {
 	WID_TF_NEW_TOWN,          ///< Create a new town.
 	WID_TF_RANDOM_TOWN,       ///< Randomly place a town.
 	WID_TF_MANY_RANDOM_TOWNS, ///< Randomly place many towns.
 	WID_TF_EXPAND_ALL_TOWNS,  ///< Make all towns grow slightly.
 	WID_TF_TOWN_NAME_EDITBOX, ///< Editor for the town name.
 	WID_TF_TOWN_NAME_RANDOM,  ///< Generate a random town name.

src/widgets/transparency_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file transparency_widget.h Types related to the transparency widgets. */
 #ifndef WIDGETS_TRANSPARENCY_WIDGET_H
 #define WIDGETS_TRANSPARENCY_WIDGET_H
 /** Widgets of the #TransparenciesWindow class. */
 enum TransparencyToolbarWidgets {
+enum TransparencyToolbarWidgets : WidgetID {
 	/* Button row. */
 	WID_TT_BEGIN,                    ///< First toggle button.
 	WID_TT_SIGNS = WID_TT_BEGIN,     ///< Signs background transparency toggle button.
 	WID_TT_TREES,                    ///< Trees transparency toggle button.
 	WID_TT_HOUSES,                   ///< Houses transparency toggle button.
 	WID_TT_INDUSTRIES,               ///< industries transparency toggle button.

src/widgets/tree_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file tree_widget.h Types related to the tree widgets. */
 #ifndef WIDGETS_TREE_WIDGET_H
 #define WIDGETS_TREE_WIDGET_H
 /** Widgets of the #BuildTreesWindow class. */
 enum BuildTreesWidgets {
+enum BuildTreesWidgets : WidgetID {
 	WID_BT_TYPE_RANDOM,     ///< Button to build random type of tree.
 	WID_BT_SE_PANE,         ///< Selection pane to show/hide scenario editor tools.
 	WID_BT_MODE_NORMAL,     ///< Select normal/rectangle planting mode.
 	WID_BT_MODE_FOREST_SM,  ///< Select small forest planting mode.
 	WID_BT_MODE_FOREST_LG,  ///< Select large forest planting mode.
 	WID_BT_MANY_RANDOM,     ///< Button to build many random trees.

src/widgets/vehicle_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file vehicle_widget.h Types related to the vehicle widgets. */
 #ifndef WIDGETS_VEHICLE_WIDGET_H
 #define WIDGETS_VEHICLE_WIDGET_H
 /** Widgets of the #VehicleViewWindow class. */
 enum VehicleViewWidgets {
+enum VehicleViewWidgets : WidgetID {
 	WID_VV_CAPTION,            ///< Caption of window.
 	WID_VV_VIEWPORT,           ///< Viewport widget.
 	WID_VV_START_STOP,         ///< Start or stop this vehicle, and show information about the current state.
 	WID_VV_RENAME,             ///< Rename vehicle
 	WID_VV_LOCATION,           ///< Center the main view on this vehicle.
 	WID_VV_ORDER_LOCATION,     ///< Center the main view on the order's target location.
@@ @@ -28,26 +28,26 @@ enum VehicleViewWidgets { @@
 	WID_VV_TURN_AROUND,        ///< Turn this vehicle around.
 	WID_VV_FORCE_PROCEED,      ///< Force this vehicle to pass a signal at danger.
 	WID_VV_HONK_HORN,          ///< Honk the vehicles horn (not drawn on UI, only used for hotkey).
 };
 /** Widgets of the #RefitWindow class. */
 enum VehicleRefitWidgets {
+enum VehicleRefitWidgets : WidgetID {
 	WID_VR_CAPTION,               ///< Caption of window.
 	WID_VR_VEHICLE_PANEL_DISPLAY, ///< Display with a representation of the vehicle to refit.
 	WID_VR_SHOW_HSCROLLBAR,       ///< Selection widget for the horizontal scrollbar.
 	WID_VR_HSCROLLBAR,            ///< Horizontal scrollbar or the vehicle display.
 	WID_VR_SELECT_HEADER,         ///< Header with question about the cargo to carry.
 	WID_VR_MATRIX,                ///< Options to refit to.
 	WID_VR_SCROLLBAR,             ///< Scrollbar for the refit options.
 	WID_VR_INFO,                  ///< Information about the currently selected refit option.
 	WID_VR_REFIT,                 ///< Perform the refit.
 };
 /** Widgets of the #VehicleDetailsWindow class. */
 enum VehicleDetailsWidgets {
+enum VehicleDetailsWidgets : WidgetID {
 	WID_VD_CAPTION,                     ///< Caption of window.
 	WID_VD_TOP_DETAILS,                 ///< Panel with generic details.
 	WID_VD_INCREASE_SERVICING_INTERVAL, ///< Increase the servicing interval.
 	WID_VD_DECREASE_SERVICING_INTERVAL, ///< Decrease the servicing interval.
 	WID_VD_SERVICE_INTERVAL_DROPDOWN,   ///< Dropdown to select default/days/percent service interval.
 	WID_VD_SERVICING_INTERVAL,          ///< Information about the servicing interval.
@@ @@ -58,13 +58,13 @@ enum VehicleDetailsWidgets { @@
 	WID_VD_DETAILS_TRAIN_VEHICLES,      ///< Show all parts of the train with their description.
 	WID_VD_DETAILS_CAPACITY_OF_EACH,    ///< Show the capacity of all train parts.
 	WID_VD_DETAILS_TOTAL_CARGO,         ///< Show the capacity and carried cargo amounts aggregated per cargo of the train.
 };
 /** Widgets of the #VehicleListWindow class. */
 enum VehicleListWidgets {
+enum VehicleListWidgets : WidgetID {
 	WID_VL_CAPTION,                  ///< Caption of window (for non shared orders windows).
 	WID_VL_CAPTION_SHARED_ORDERS,    ///< Caption of window (for shared orders windows).
 	WID_VL_CAPTION_SELECTION,        ///< Selection for caption.
 	WID_VL_ORDER_VIEW,               ///< Button to open order window (for shared orders windows).
 	WID_VL_GROUP_ORDER,              ///< Group order.
 	WID_VL_GROUP_BY_PULLDOWN,        ///< Group by dropdown list.

src/widgets/viewport_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file viewport_widget.h Types related to the viewport widgets. */
 #ifndef WIDGETS_VIEWPORT_WIDGET_H
 #define WIDGETS_VIEWPORT_WIDGET_H
 /** Widgets of the #ExtraViewportWindow class. */
 enum ExtraViewportWidgets {
+enum ExtraViewportWidgets : WidgetID {
 	WID_EV_CAPTION,      ///< Caption of window.
 	WID_EV_VIEWPORT,     ///< The viewport.
 	WID_EV_ZOOM_IN,      ///< Zoom in.
 	WID_EV_ZOOM_OUT,     ///< Zoom out.
 	WID_EV_MAIN_TO_VIEW, ///< Center the view of this viewport on the main view.
 	WID_EV_VIEW_TO_MAIN, ///< Center the main view on the view of this viewport.

src/widgets/waypoint_widget.h

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
 /** @file waypoint_widget.h Types related to the waypoint widgets. */
 #ifndef WIDGETS_WAYPOINT_WIDGET_H
 #define WIDGETS_WAYPOINT_WIDGET_H
 /** Widgets of the #WaypointWindow class. */
 enum WaypointWidgets {
+enum WaypointWidgets : WidgetID {
 	WID_W_CAPTION,       ///< Caption of window.
 	WID_W_VIEWPORT,      ///< The viewport on this waypoint.
 	WID_W_CENTER_VIEW,   ///< Center the main view on this waypoint.
 	WID_W_RENAME,        ///< Rename this waypoint.
 	WID_W_SHOW_VEHICLES, ///< Show the vehicles visiting this waypoint.
 	WID_W_CATCHMENT,     ///< Coverage button.

0 comments (0 inline, 0 general)