Merge commit '73bed054b87399484e39f6972d30f91a404daba8'

2024-04-03 19:37:54 +01:00
parent 0e2f7614ea 73bed054b8
commit 2eb3ee919b
1355 changed files with 153171 additions and 81528 deletions
@@ -11,7 +11,7 @@
 #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.
@@ -52,7 +52,7 @@ enum ToolbarNormalWidgets {
 };

 /** 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.