From 8157a8afd814cb24aaaa4c725817c864e0c583c6 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 26 May 2013 19:25:01 +0000 Subject: [PATCH] (svn r25290) -Add: Assign string names to notable windows. --- src/ai/ai_gui.cpp | 8 ++++---- src/airport_gui.cpp | 4 ++-- src/autoreplace_gui.cpp | 4 ++-- src/bootstrap_gui.cpp | 6 +++--- src/bridge_gui.cpp | 2 +- src/build_vehicle_gui.cpp | 2 +- src/cheat_gui.cpp | 2 +- src/company_gui.cpp | 12 ++++++------ src/console_gui.cpp | 2 +- src/date_gui.cpp | 2 +- src/depot_gui.cpp | 8 ++++---- src/dock_gui.cpp | 8 ++++---- src/engine_gui.cpp | 2 +- src/error_gui.cpp | 4 ++-- src/fios_gui.cpp | 6 +++--- src/genworld_gui.cpp | 8 ++++---- src/goal_gui.cpp | 4 ++-- src/graph_gui.cpp | 18 +++++++++--------- src/group_gui.cpp | 4 ++-- src/highscore_gui.cpp | 4 ++-- src/industry_gui.cpp | 8 ++++---- src/intro_gui.cpp | 2 +- src/linkgraph/linkgraph_gui.cpp | 2 +- src/main_gui.cpp | 2 +- src/misc_gui.cpp | 10 +++++----- src/music_gui.cpp | 4 ++-- src/network/network_chat_gui.cpp | 2 +- src/network/network_content_gui.cpp | 4 ++-- src/network/network_gui.cpp | 14 +++++++------- src/newgrf_debug_gui.cpp | 4 ++-- src/newgrf_gui.cpp | 6 +++--- src/news_gui.cpp | 12 ++++++------ src/object_gui.cpp | 2 +- src/order_gui.cpp | 6 +++--- src/osk_gui.cpp | 2 +- src/rail_gui.cpp | 10 +++++----- src/road_gui.cpp | 10 +++++----- src/settings_gui.cpp | 6 +++--- src/signs_gui.cpp | 4 ++-- src/smallmap_gui.cpp | 2 +- src/station_gui.cpp | 6 +++--- src/statusbar_gui.cpp | 2 +- src/subsidy_gui.cpp | 2 +- src/terraform_gui.cpp | 4 ++-- src/textfile_gui.cpp | 2 +- src/timetable_gui.cpp | 2 +- src/toolbar_gui.cpp | 4 ++-- src/town_gui.cpp | 10 +++++----- src/transparency_gui.cpp | 2 +- src/tree_gui.cpp | 2 +- src/vehicle_gui.cpp | 12 ++++++------ src/viewport_gui.cpp | 2 +- src/waypoint_gui.cpp | 2 +- src/widgets/dropdown.cpp | 2 +- src/window.cpp | 3 ++- src/window_gui.h | 3 ++- 56 files changed, 142 insertions(+), 140 deletions(-) diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index bfa9853795..977a4e1411 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -258,7 +258,7 @@ static const NWidgetPart _nested_ai_list_widgets[] = { /** Window definition for the ai list window. */ static WindowDesc _ai_list_desc( - WDP_CENTER, 200, 234, + WDP_CENTER, "settings_script_list", 200, 234, WC_AI_LIST, WC_NONE, 0, _nested_ai_list_widgets, lengthof(_nested_ai_list_widgets) @@ -604,7 +604,7 @@ static const NWidgetPart _nested_ai_settings_widgets[] = { /** Window definition for the AI settings window. */ static WindowDesc _ai_settings_desc( - WDP_CENTER, 500, 208, + WDP_CENTER, "settings_script", 500, 208, WC_AI_SETTINGS, WC_NONE, 0, _nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets) @@ -698,7 +698,7 @@ static const NWidgetPart _nested_ai_config_widgets[] = { /** Window definition for the configure AI window. */ static WindowDesc _ai_config_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, "settings_script_config", 0, 0, WC_GAME_OPTIONS, WC_NONE, 0, _nested_ai_config_widgets, lengthof(_nested_ai_config_widgets) @@ -1487,7 +1487,7 @@ static const NWidgetPart _nested_ai_debug_widgets[] = { /** Window definition for the AI debug window. */ static WindowDesc _ai_debug_desc( - WDP_AUTO, 600, 450, + WDP_AUTO, "script_debug", 600, 450, WC_AI_DEBUG, WC_NONE, 0, _nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 55f7e4ad93..597e3291e4 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -166,7 +166,7 @@ static const NWidgetPart _nested_air_toolbar_widgets[] = { }; static WindowDesc _air_toolbar_desc( - WDP_ALIGN_TOOLBAR, 0, 0, + WDP_ALIGN_TOOLBAR, "toolbar_air", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets) @@ -555,7 +555,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = { }; static WindowDesc _build_airport_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "build_station_air", 0, 0, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_airport_widgets, lengthof(_nested_build_airport_widgets) diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 7a1b8b297c..547b2b0e84 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -564,7 +564,7 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = { }; static WindowDesc _replace_rail_vehicle_desc( - WDP_AUTO, 500, 140, + WDP_AUTO, "replace_vehicle_train", 500, 140, WC_REPLACE_VEHICLE, WC_NONE, WDF_CONSTRUCTION, _nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets) @@ -596,7 +596,7 @@ static const NWidgetPart _nested_replace_vehicle_widgets[] = { }; static WindowDesc _replace_vehicle_desc( - WDP_AUTO, 456, 118, + WDP_AUTO, "replace_vehicle", 456, 118, WC_REPLACE_VEHICLE, WC_NONE, WDF_CONSTRUCTION, _nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets) diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp index bfcf7eeadb..a4ad861822 100644 --- a/src/bootstrap_gui.cpp +++ b/src/bootstrap_gui.cpp @@ -38,7 +38,7 @@ static const struct NWidgetPart _background_widgets[] = { * Window description for the background window to prevent smearing. */ static WindowDesc _background_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_BOOTSTRAP, WC_NONE, 0, _background_widgets, lengthof(_background_widgets) @@ -71,7 +71,7 @@ static const NWidgetPart _nested_boostrap_download_status_window_widgets[] = { /** Window description for the download window */ static WindowDesc _bootstrap_download_status_window_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_NETWORK_STATUS_WINDOW, WC_NONE, WDF_MODAL, _nested_boostrap_download_status_window_widgets, lengthof(_nested_boostrap_download_status_window_widgets) @@ -116,7 +116,7 @@ static const NWidgetPart _bootstrap_query_widgets[] = { /** The window description for the query. */ static WindowDesc _bootstrap_query_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_CONFIRM_POPUP_QUERY, WC_NONE, 0, _bootstrap_query_widgets, lengthof(_bootstrap_query_widgets) diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index e6a0812a59..79d4e068c0 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -352,7 +352,7 @@ static const NWidgetPart _nested_build_bridge_widgets[] = { /** Window definition for the rail bridge selection window. */ static WindowDesc _build_bridge_desc( - WDP_AUTO, 200, 114, + WDP_AUTO, "build_bridge", 200, 114, WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_bridge_widgets, lengthof(_nested_build_bridge_widgets) diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 9698e22eb4..e9fdb9a361 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1405,7 +1405,7 @@ struct BuildVehicleWindow : Window { }; static WindowDesc _build_vehicle_desc( - WDP_AUTO, 240, 268, + WDP_AUTO, "build_vehicle", 240, 268, WC_BUILD_VEHICLE, WC_NONE, WDF_CONSTRUCTION, _nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets) diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index ac42cf9130..47c34566fd 100644 --- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -349,7 +349,7 @@ struct CheatWindow : Window { /** Window description of the cheats GUI. */ static WindowDesc _cheats_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "cheats", 0, 0, WC_CHEATS, WC_NONE, 0, _nested_cheat_widgets, lengthof(_nested_cheat_widgets) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 8ace49875d..b763aa3630 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -464,7 +464,7 @@ struct CompanyFinancesWindow : Window { Money CompanyFinancesWindow::max_money = INT32_MAX; static WindowDesc _company_finances_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "company_finances", 0, 0, WC_FINANCES, WC_NONE, 0, _nested_company_finances_widgets, lengthof(_nested_company_finances_widgets) @@ -842,7 +842,7 @@ static const NWidgetPart _nested_select_company_livery_widgets [] = { }; static WindowDesc _select_company_livery_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "company_livery", 0, 0, WC_COMPANY_COLOUR, WC_NONE, 0, _nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets) @@ -1480,7 +1480,7 @@ const StringID SelectCompanyManagerFaceWindow::PART_TEXTS[] = { /** Company manager face selection window description */ static WindowDesc _select_company_manager_face_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "company_face", 0, 0, WC_COMPANY_MANAGER_FACE, WC_NONE, WDF_CONSTRUCTION, _nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets) @@ -1834,7 +1834,7 @@ struct CompanyInfrastructureWindow : Window }; static WindowDesc _company_infrastructure_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "company_infrastructure", 0, 0, WC_COMPANY_INFRASTRUCTURE, WC_NONE, 0, _nested_company_infrastructure_widgets, lengthof(_nested_company_infrastructure_widgets) @@ -2411,7 +2411,7 @@ struct CompanyWindow : Window }; static WindowDesc _company_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "company", 0, 0, WC_COMPANY, WC_NONE, 0, _nested_company_widgets, lengthof(_nested_company_widgets) @@ -2523,7 +2523,7 @@ static const NWidgetPart _nested_buy_company_widgets[] = { }; static WindowDesc _buy_company_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUY_COMPANY, WC_NONE, WDF_CONSTRUCTION, _nested_buy_company_widgets, lengthof(_nested_buy_company_widgets) diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 5787a50894..33e2ed1c54 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -159,7 +159,7 @@ static const struct NWidgetPart _nested_console_window_widgets[] = { }; static WindowDesc _console_window_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_CONSOLE, WC_NONE, 0, _nested_console_window_widgets, lengthof(_nested_console_window_widgets) diff --git a/src/date_gui.cpp b/src/date_gui.cpp index 771d0e1e04..1287c4463a 100644 --- a/src/date_gui.cpp +++ b/src/date_gui.cpp @@ -195,7 +195,7 @@ static const NWidgetPart _nested_set_date_widgets[] = { /** Description of the date setting window. */ static WindowDesc _set_date_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_SET_DATE, WC_NONE, 0, _nested_set_date_widgets, lengthof(_nested_set_date_widgets) diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 27280dadb0..e897fec214 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -79,28 +79,28 @@ static const NWidgetPart _nested_train_depot_widgets[] = { }; static WindowDesc _train_depot_desc( - WDP_AUTO, 362, 123, + WDP_AUTO, "depot_train", 362, 123, WC_VEHICLE_DEPOT, WC_NONE, 0, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static WindowDesc _road_depot_desc( - WDP_AUTO, 316, 97, + WDP_AUTO, "depot_roadveh", 316, 97, WC_VEHICLE_DEPOT, WC_NONE, 0, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static WindowDesc _ship_depot_desc( - WDP_AUTO, 306, 99, + WDP_AUTO, "depot_ship", 306, 99, WC_VEHICLE_DEPOT, WC_NONE, 0, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static WindowDesc _aircraft_depot_desc( - WDP_AUTO, 332, 99, + WDP_AUTO, "depot_aircraft", 332, 99, WC_VEHICLE_DEPOT, WC_NONE, 0, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index d6fbd53f20..0e4f8ed9f5 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -314,7 +314,7 @@ static const NWidgetPart _nested_build_docks_toolbar_widgets[] = { }; static WindowDesc _build_docks_toolbar_desc( - WDP_ALIGN_TOOLBAR, 0, 0, + WDP_ALIGN_TOOLBAR, "toolbar_water", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_docks_toolbar_widgets, lengthof(_nested_build_docks_toolbar_widgets) @@ -366,7 +366,7 @@ static const NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = { /** Window definition for the build docks in scenario editor window. */ static WindowDesc _build_docks_scen_toolbar_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "toolbar_water_scen", 0, 0, WC_SCEN_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets) @@ -466,7 +466,7 @@ static const NWidgetPart _nested_build_dock_station_widgets[] = { }; static WindowDesc _build_dock_station_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_dock_station_widgets, lengthof(_nested_build_dock_station_widgets) @@ -543,7 +543,7 @@ static const NWidgetPart _nested_build_docks_depot_widgets[] = { }; static WindowDesc _build_docks_depot_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_docks_depot_widgets, lengthof(_nested_build_docks_depot_widgets) diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 8f4252f856..6ee47692d4 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -121,7 +121,7 @@ struct EnginePreviewWindow : Window { }; static WindowDesc _engine_preview_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, "engine_preview", 0, 0, WC_ENGINE_PREVIEW, WC_NONE, WDF_CONSTRUCTION, _nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets) diff --git a/src/error_gui.cpp b/src/error_gui.cpp index df5aa7b6db..ccbc18850b 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -40,7 +40,7 @@ static const NWidgetPart _nested_errmsg_widgets[] = { }; static WindowDesc _errmsg_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, "error", 0, 0, WC_ERRMSG, WC_NONE, 0, _nested_errmsg_widgets, lengthof(_nested_errmsg_widgets) @@ -60,7 +60,7 @@ static const NWidgetPart _nested_errmsg_face_widgets[] = { }; static WindowDesc _errmsg_face_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, "error_face", 0, 0, WC_ERRMSG, WC_NONE, 0, _nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets) diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index e186c7e125..75a9dd2fb5 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -697,7 +697,7 @@ public: /** Load game/scenario */ static WindowDesc _load_dialog_desc( - WDP_CENTER, 500, 294, + WDP_CENTER, "load_game", 500, 294, WC_SAVELOAD, WC_NONE, 0, _nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets) @@ -705,7 +705,7 @@ static WindowDesc _load_dialog_desc( /** Load heightmap */ static WindowDesc _load_heightmap_dialog_desc( - WDP_CENTER, 257, 320, + WDP_CENTER, "load_heightmap", 257, 320, WC_SAVELOAD, WC_NONE, 0, _nested_load_heightmap_dialog_widgets, lengthof(_nested_load_heightmap_dialog_widgets) @@ -713,7 +713,7 @@ static WindowDesc _load_heightmap_dialog_desc( /** Save game/scenario */ static WindowDesc _save_dialog_desc( - WDP_CENTER, 500, 294, + WDP_CENTER, "save_game", 500, 294, WC_SAVELOAD, WC_NONE, 0, _nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets) diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index f5da7f950c..b1ecc68eee 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -797,14 +797,14 @@ struct GenerateLandscapeWindow : public Window { }; static WindowDesc _generate_landscape_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_GENERATE_LANDSCAPE, WC_NONE, 0, _nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets) ); static WindowDesc _heightmap_load_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_GENERATE_LANDSCAPE, WC_NONE, 0, _nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets) @@ -1098,7 +1098,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = { }; static WindowDesc _create_scenario_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_GENERATE_LANDSCAPE, WC_NONE, 0, _nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets) @@ -1126,7 +1126,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = { static WindowDesc _generate_progress_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_MODAL_PROGRESS, WC_NONE, 0, _nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets) diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp index e738617a67..32c7b78ecc 100644 --- a/src/goal_gui.cpp +++ b/src/goal_gui.cpp @@ -231,7 +231,7 @@ static const NWidgetPart _nested_goals_list_widgets[] = { }; static WindowDesc _goals_list_desc( - WDP_AUTO, 500, 127, + WDP_AUTO, "list_goals", 500, 127, WC_GOALS_LIST, WC_NONE, 0, _nested_goals_list_widgets, lengthof(_nested_goals_list_widgets) @@ -360,7 +360,7 @@ static const NWidgetPart _nested_goal_question_widgets[] = { }; static WindowDesc _goal_question_list_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_GOAL_QUESTION, WC_NONE, WDF_CONSTRUCTION, _nested_goal_question_widgets, lengthof(_nested_goal_question_widgets) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 7a4abdeaf6..3cb5adfda9 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -141,7 +141,7 @@ static const NWidgetPart _nested_graph_legend_widgets[] = { }; static WindowDesc _graph_legend_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_legend", 0, 0, WC_GRAPH_LEGEND, WC_NONE, 0, _nested_graph_legend_widgets, lengthof(_nested_graph_legend_widgets) @@ -643,7 +643,7 @@ static const NWidgetPart _nested_operating_profit_widgets[] = { }; static WindowDesc _operating_profit_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_operating_profit", 0, 0, WC_OPERATING_PROFIT, WC_NONE, 0, _nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets) @@ -693,7 +693,7 @@ static const NWidgetPart _nested_income_graph_widgets[] = { }; static WindowDesc _income_graph_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_income", 0, 0, WC_INCOME_GRAPH, WC_NONE, 0, _nested_income_graph_widgets, lengthof(_nested_income_graph_widgets) @@ -741,7 +741,7 @@ static const NWidgetPart _nested_delivered_cargo_graph_widgets[] = { }; static WindowDesc _delivered_cargo_graph_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_delivered_cargo", 0, 0, WC_DELIVERED_CARGO, WC_NONE, 0, _nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets) @@ -796,7 +796,7 @@ static const NWidgetPart _nested_performance_history_widgets[] = { }; static WindowDesc _performance_history_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_performance", 0, 0, WC_PERFORMANCE_HISTORY, WC_NONE, 0, _nested_performance_history_widgets, lengthof(_nested_performance_history_widgets) @@ -844,7 +844,7 @@ static const NWidgetPart _nested_company_value_graph_widgets[] = { }; static WindowDesc _company_value_graph_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_company_value", 0, 0, WC_COMPANY_VALUE, WC_NONE, 0, _nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets) @@ -1074,7 +1074,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { }; static WindowDesc _cargo_payment_rates_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "graph_cargo_payment_rates", 0, 0, WC_PAYMENT_RATES, WC_NONE, 0, _nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets) @@ -1263,7 +1263,7 @@ static const NWidgetPart _nested_company_league_widgets[] = { }; static WindowDesc _company_league_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "league", 0, 0, WC_COMPANY_LEAGUE, WC_NONE, 0, _nested_company_league_widgets, lengthof(_nested_company_league_widgets) @@ -1562,7 +1562,7 @@ static const NWidgetPart _nested_performance_rating_detail_widgets[] = { }; static WindowDesc _performance_rating_detail_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "league_details", 0, 0, WC_PERFORMANCE_DETAIL, WC_NONE, 0, _nested_performance_rating_detail_widgets, lengthof(_nested_performance_rating_detail_widgets) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index a37a056d37..91fd9046c9 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -799,14 +799,14 @@ public: static WindowDesc _other_group_desc( - WDP_AUTO, 460, 246, + WDP_AUTO, "list_groups", 460, 246, WC_INVALID, WC_NONE, 0, _nested_group_widgets, lengthof(_nested_group_widgets) ); static WindowDesc _train_group_desc( - WDP_AUTO, 525, 246, + WDP_AUTO, "list_groups_train", 525, 246, WC_TRAINS_LIST, WC_NONE, 0, _nested_group_widgets, lengthof(_nested_group_widgets) diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index 50bb33c5e2..5485866aa1 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -204,14 +204,14 @@ static const NWidgetPart _nested_highscore_widgets[] = { }; static WindowDesc _highscore_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_HIGHSCORE, WC_NONE, 0, _nested_highscore_widgets, lengthof(_nested_highscore_widgets) ); static WindowDesc _endgame_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_ENDSCREEN, WC_NONE, 0, _nested_highscore_widgets, lengthof(_nested_highscore_widgets) diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 356c6b77b2..b7f50f248f 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -188,7 +188,7 @@ static const NWidgetPart _nested_build_industry_widgets[] = { /** Window definition of the dynamic place industries gui */ static WindowDesc _build_industry_desc( - WDP_AUTO, 170, 212, + WDP_AUTO, "build_industry", 170, 212, WC_BUILD_INDUSTRY, WC_NONE, WDF_CONSTRUCTION, _nested_build_industry_widgets, lengthof(_nested_build_industry_widgets) @@ -1018,7 +1018,7 @@ static const NWidgetPart _nested_industry_view_widgets[] = { /** Window definition of the view industry gui */ static WindowDesc _industry_view_desc( - WDP_AUTO, 260, 120, + WDP_AUTO, "view_industry", 260, 120, WC_INDUSTRY_VIEW, WC_NONE, 0, _nested_industry_view_widgets, lengthof(_nested_industry_view_widgets) @@ -1389,7 +1389,7 @@ const StringID IndustryDirectoryWindow::sorter_names[] = { /** Window definition of the industry directory gui */ static WindowDesc _industry_directory_desc( - WDP_AUTO, 428, 190, + WDP_AUTO, "list_industries", 428, 190, WC_INDUSTRY_DIRECTORY, WC_NONE, 0, _nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets) @@ -1430,7 +1430,7 @@ static const NWidgetPart _nested_industry_cargoes_widgets[] = { /** Window description for the industry cargoes window. */ static WindowDesc _industry_cargoes_desc( - WDP_AUTO, 300, 210, + WDP_AUTO, "industry_cargoes", 300, 210, WC_INDUSTRY_CARGOES, WC_NONE, 0, _nested_industry_cargoes_widgets, lengthof(_nested_industry_cargoes_widgets) diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 3148b63607..5d13058944 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -247,7 +247,7 @@ static const NWidgetPart _nested_select_game_widgets[] = { }; static WindowDesc _select_game_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_SELECT_GAME, WC_NONE, 0, _nested_select_game_widgets, lengthof(_nested_select_game_widgets) diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp index 1fd852c5e3..b69d18411b 100644 --- a/src/linkgraph/linkgraph_gui.cpp +++ b/src/linkgraph/linkgraph_gui.cpp @@ -381,7 +381,7 @@ assert_compile(WID_LGL_SATURATION_LAST - WID_LGL_SATURATION_FIRST == lengthof(LinkGraphOverlay::LINK_COLOURS) - 1); static WindowDesc _linkgraph_legend_desc( - WDP_MANUAL, 300, 314, + WDP_MANUAL, "toolbar_linkgraph", 300, 314, WC_LINKGRAPH_LEGEND, WC_NONE, 0, _nested_linkgraph_legend_widgets, lengthof(_nested_linkgraph_legend_widgets) diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 5a1f574494..99857bff79 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -207,7 +207,7 @@ static const struct NWidgetPart _nested_main_window_widgets[] = { }; static WindowDesc _main_window_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_MAIN_WINDOW, WC_NONE, 0, _nested_main_window_widgets, lengthof(_nested_main_window_widgets) diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index d072549759..7dd1c71ff1 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -49,7 +49,7 @@ static const NWidgetPart _nested_land_info_widgets[] = { }; static WindowDesc _land_info_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "land_info", 0, 0, WC_LAND_INFO, WC_NONE, 0, _nested_land_info_widgets, lengthof(_nested_land_info_widgets) @@ -366,7 +366,7 @@ static const NWidgetPart _nested_about_widgets[] = { }; static WindowDesc _about_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_GAME_OPTIONS, WC_NONE, 0, _nested_about_widgets, lengthof(_nested_about_widgets) @@ -616,7 +616,7 @@ static const NWidgetPart _nested_tooltips_widgets[] = { }; static WindowDesc _tool_tips_desc( - WDP_MANUAL, 0, 0, // Coordinates and sizes are not used, + WDP_MANUAL, NULL, 0, 0, // Coordinates and sizes are not used, WC_TOOLTIPS, WC_NONE, 0, _nested_tooltips_widgets, lengthof(_nested_tooltips_widgets) @@ -919,7 +919,7 @@ static const NWidgetPart _nested_query_string_widgets[] = { }; static WindowDesc _query_string_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, "query_string", 0, 0, WC_QUERY_STRING, WC_NONE, 0, _nested_query_string_widgets, lengthof(_nested_query_string_widgets) @@ -1060,7 +1060,7 @@ static const NWidgetPart _nested_query_widgets[] = { }; static WindowDesc _query_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_CONFIRM_POPUP_QUERY, WC_NONE, WDF_MODAL, _nested_query_widgets, lengthof(_nested_query_widgets) diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 3f57da9645..aabf230820 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -496,7 +496,7 @@ static const NWidgetPart _nested_music_track_selection_widgets[] = { }; static WindowDesc _music_track_selection_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "music_track", 0, 0, WC_MUSIC_TRACK_SELECTION, WC_NONE, 0, _nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets) @@ -759,7 +759,7 @@ static const NWidgetPart _nested_music_window_widgets[] = { }; static WindowDesc _music_window_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "music", 0, 0, WC_MUSIC_WINDOW, WC_NONE, 0, _nested_music_window_widgets, lengthof(_nested_music_window_widgets) diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 5e7d118210..c6e2408cb8 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -541,7 +541,7 @@ static const NWidgetPart _nested_chat_window_widgets[] = { /** The description of the chat window. */ static WindowDesc _chat_window_desc( - WDP_MANUAL, 640, 14, // x, y, width, height + WDP_MANUAL, NULL, 640, 14, // x, y, width, height WC_SEND_NETWORK_MSG, WC_NONE, 0, _nested_chat_window_widgets, lengthof(_nested_chat_window_widgets) diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index ba30199ae6..619526c176 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -92,7 +92,7 @@ static const NWidgetPart _nested_network_content_download_status_window_widgets[ /** Window description for the download window */ static WindowDesc _network_content_download_status_window_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_NETWORK_STATUS_WINDOW, WC_NONE, WDF_MODAL, _nested_network_content_download_status_window_widgets, lengthof(_nested_network_content_download_status_window_widgets) @@ -1033,7 +1033,7 @@ static const NWidgetPart _nested_network_content_list_widgets[] = { /** Window description of the content list */ static WindowDesc _network_content_list_desc( - WDP_CENTER, 630, 460, + WDP_CENTER, "list_content", 630, 460, WC_NETWORK_WINDOW, WC_NONE, 0, _nested_network_content_list_widgets, lengthof(_nested_network_content_list_widgets) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 80cdcda833..56cc35e4e9 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1012,7 +1012,7 @@ static const NWidgetPart _nested_network_game_widgets[] = { }; static WindowDesc _network_game_window_desc( - WDP_CENTER, 1000, 730, + WDP_CENTER, "list_servers", 1000, 730, WC_NETWORK_WINDOW, WC_NONE, 0, _nested_network_game_widgets, lengthof(_nested_network_game_widgets) @@ -1327,7 +1327,7 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = { }; static WindowDesc _network_start_server_window_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_NETWORK_WINDOW, WC_NONE, 0, _nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets) @@ -1616,7 +1616,7 @@ static const NWidgetPart _nested_network_lobby_window_widgets[] = { }; static WindowDesc _network_lobby_window_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_NETWORK_WINDOW, WC_NONE, 0, _nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets) @@ -1665,7 +1665,7 @@ static const NWidgetPart _nested_client_list_popup_widgets[] = { }; static WindowDesc _client_list_popup_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_CLIENT_LIST_POPUP, WC_CLIENT_LIST, 0, _nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets) @@ -1841,7 +1841,7 @@ static const NWidgetPart _nested_client_list_widgets[] = { }; static WindowDesc _client_list_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "list_clients", 0, 0, WC_CLIENT_LIST, WC_NONE, 0, _nested_client_list_widgets, lengthof(_nested_client_list_widgets) @@ -2113,7 +2113,7 @@ static const NWidgetPart _nested_network_join_status_window_widgets[] = { }; static WindowDesc _network_join_status_window_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_NETWORK_STATUS_WINDOW, WC_NONE, WDF_MODAL, _nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets) @@ -2207,7 +2207,7 @@ static const NWidgetPart _nested_network_company_password_window_widgets[] = { }; static WindowDesc _network_company_password_window_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_COMPANY_PASSWORD_WINDOW, WC_NONE, 0, _nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets) diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp index f4a6585a9e..def6564751 100644 --- a/src/newgrf_debug_gui.cpp +++ b/src/newgrf_debug_gui.cpp @@ -519,7 +519,7 @@ static const NWidgetPart _nested_newgrf_inspect_widgets[] = { }; static WindowDesc _newgrf_inspect_desc( - WDP_AUTO, 400, 300, + WDP_AUTO, "newgrf_inspect", 400, 300, WC_NEWGRF_INSPECT, WC_NONE, 0, _nested_newgrf_inspect_widgets, lengthof(_nested_newgrf_inspect_widgets) @@ -873,7 +873,7 @@ static const NWidgetPart _nested_sprite_aligner_widgets[] = { }; static WindowDesc _sprite_aligner_desc( - WDP_AUTO, 400, 300, + WDP_AUTO, "sprite_aligner", 400, 300, WC_SPRITE_ALIGNER, WC_NONE, 0, _nested_sprite_aligner_widgets, lengthof(_nested_sprite_aligner_widgets) diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 02aca44a3f..59e39535b8 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -529,7 +529,7 @@ static const NWidgetPart _nested_newgrf_parameter_widgets[] = { /** Window definition for the change grf parameters window */ static WindowDesc _newgrf_parameters_desc( - WDP_CENTER, 500, 208, + WDP_CENTER, "settings_newgrf_config", 500, 208, WC_GRF_PARAMETERS, WC_NONE, 0, _nested_newgrf_parameter_widgets, lengthof(_nested_newgrf_parameter_widgets) @@ -1878,7 +1878,7 @@ static const NWidgetPart _nested_newgrf_widgets[] = { /* Window definition of the manage newgrfs window */ static WindowDesc _newgrf_desc( - WDP_CENTER, 300, 263, + WDP_CENTER, "settings_newgrf", 300, 263, WC_GAME_OPTIONS, WC_NONE, 0, _nested_newgrf_widgets, lengthof(_nested_newgrf_widgets) @@ -1949,7 +1949,7 @@ static const NWidgetPart _nested_scan_progress_widgets[] = { /** Description of the widgets and other settings of the window. */ static WindowDesc _scan_progress_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_MODAL_PROGRESS, WC_NONE, 0, _nested_scan_progress_widgets, lengthof(_nested_scan_progress_widgets) diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 67ef036789..97c31b0d1d 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -90,7 +90,7 @@ static const NWidgetPart _nested_normal_news_widgets[] = { }; static WindowDesc _normal_news_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_NEWS_WINDOW, WC_NONE, 0, _nested_normal_news_widgets, lengthof(_nested_normal_news_widgets) @@ -117,7 +117,7 @@ static const NWidgetPart _nested_vehicle_news_widgets[] = { }; static WindowDesc _vehicle_news_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_NEWS_WINDOW, WC_NONE, 0, _nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets) @@ -148,7 +148,7 @@ static const NWidgetPart _nested_company_news_widgets[] = { }; static WindowDesc _company_news_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_NEWS_WINDOW, WC_NONE, 0, _nested_company_news_widgets, lengthof(_nested_company_news_widgets) @@ -171,7 +171,7 @@ static const NWidgetPart _nested_thin_news_widgets[] = { }; static WindowDesc _thin_news_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_NEWS_WINDOW, WC_NONE, 0, _nested_thin_news_widgets, lengthof(_nested_thin_news_widgets) @@ -195,7 +195,7 @@ static const NWidgetPart _nested_small_news_widgets[] = { }; static WindowDesc _small_news_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_NEWS_WINDOW, WC_NONE, 0, _nested_small_news_widgets, lengthof(_nested_small_news_widgets) @@ -1110,7 +1110,7 @@ static const NWidgetPart _nested_message_history[] = { }; static WindowDesc _message_history_desc( - WDP_AUTO, 400, 140, + WDP_AUTO, "list_news", 400, 140, WC_MESSAGE_HISTORY, WC_NONE, 0, _nested_message_history, lengthof(_nested_message_history) diff --git a/src/object_gui.cpp b/src/object_gui.cpp index 6e967a6fe6..8af93120ea 100644 --- a/src/object_gui.cpp +++ b/src/object_gui.cpp @@ -489,7 +489,7 @@ static const NWidgetPart _nested_build_object_widgets[] = { }; static WindowDesc _build_object_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "build_object", 0, 0, WC_BUILD_OBJECT, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_object_widgets, lengthof(_nested_build_object_widgets) diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 04fb155d02..3061b41635 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1594,7 +1594,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = { }; static WindowDesc _orders_train_desc( - WDP_AUTO, 384, 100, + WDP_AUTO, "view_vehicle_orders_train", 384, 100, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_CONSTRUCTION, _nested_orders_train_widgets, lengthof(_nested_orders_train_widgets) @@ -1665,7 +1665,7 @@ static const NWidgetPart _nested_orders_widgets[] = { }; static WindowDesc _orders_desc( - WDP_AUTO, 384, 100, + WDP_AUTO, "view_vehicle_orders", 384, 100, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_CONSTRUCTION, _nested_orders_widgets, lengthof(_nested_orders_widgets) @@ -1690,7 +1690,7 @@ static const NWidgetPart _nested_other_orders_widgets[] = { }; static WindowDesc _other_orders_desc( - WDP_AUTO, 384, 86, + WDP_AUTO, "view_vehicle_orders_competitor", 384, 86, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_CONSTRUCTION, _nested_other_orders_widgets, lengthof(_nested_other_orders_widgets) diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index c234192fee..5dafdef118 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -340,7 +340,7 @@ static const NWidgetPart _nested_osk_widgets[] = { }; static WindowDesc _osk_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, "query_osk", 0, 0, WC_OSK, WC_NONE, 0, _nested_osk_widgets, lengthof(_nested_osk_widgets) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 5dd692c4ec..b18a219f94 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -820,7 +820,7 @@ static const NWidgetPart _nested_build_rail_widgets[] = { }; static WindowDesc _build_rail_desc( - WDP_ALIGN_TOOLBAR, 0, 0, + WDP_ALIGN_TOOLBAR, "toolbar_rail", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_rail_widgets, lengthof(_nested_build_rail_widgets) @@ -1428,7 +1428,7 @@ static const NWidgetPart _nested_station_builder_widgets[] = { /** High level window description of the station-build window (default & newGRF) */ static WindowDesc _station_builder_desc( - WDP_AUTO, 350, 0, + WDP_AUTO, "build_station_rail", 350, 0, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_station_builder_widgets, lengthof(_nested_station_builder_widgets) @@ -1615,7 +1615,7 @@ static const NWidgetPart _nested_signal_builder_widgets[] = { /** Signal selection window description */ static WindowDesc _signal_builder_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "build_signal", 0, 0, WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets) @@ -1692,7 +1692,7 @@ static const NWidgetPart _nested_build_depot_widgets[] = { }; static WindowDesc _build_depot_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_depot_widgets, lengthof(_nested_build_depot_widgets) @@ -1785,7 +1785,7 @@ static const NWidgetPart _nested_build_waypoint_widgets[] = { }; static WindowDesc _build_waypoint_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "build_waypoint", 0, 0, WC_BUILD_WAYPOINT, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_waypoint_widgets, lengthof(_nested_build_waypoint_widgets) diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 0927c2c4ab..a44ed3a5e7 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -714,7 +714,7 @@ static const NWidgetPart _nested_build_road_widgets[] = { }; static WindowDesc _build_road_desc( - WDP_ALIGN_TOOLBAR, 0, 0, + WDP_ALIGN_TOOLBAR, "toolbar_road", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_road_widgets, lengthof(_nested_build_road_widgets) @@ -753,7 +753,7 @@ static const NWidgetPart _nested_build_tramway_widgets[] = { }; static WindowDesc _build_tramway_desc( - WDP_ALIGN_TOOLBAR, 0, 0, + WDP_ALIGN_TOOLBAR, "toolbar_tramway", 0, 0, WC_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets) @@ -813,7 +813,7 @@ static const NWidgetPart _nested_build_road_scen_widgets[] = { }; static WindowDesc _build_road_scen_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "toolbar_road_scen", 0, 0, WC_SCEN_BUILD_TOOLBAR, WC_NONE, WDF_CONSTRUCTION, _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets) @@ -910,7 +910,7 @@ static const NWidgetPart _nested_build_road_depot_widgets[] = { }; static WindowDesc _build_road_depot_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_build_road_depot_widgets, lengthof(_nested_build_road_depot_widgets) @@ -1064,7 +1064,7 @@ static const NWidgetPart _nested_rv_station_picker_widgets[] = { }; static WindowDesc _rv_station_picker_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, NULL, 0, 0, WC_BUS_STATION, WC_BUILD_TOOLBAR, WDF_CONSTRUCTION, _nested_rv_station_picker_widgets, lengthof(_nested_rv_station_picker_widgets) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 96e2d0fe79..1ec7b844ee 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -663,7 +663,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { }; static WindowDesc _game_options_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, "settings_game", 0, 0, WC_GAME_OPTIONS, WC_NONE, 0, _nested_game_options_widgets, lengthof(_nested_game_options_widgets) @@ -2262,7 +2262,7 @@ static const NWidgetPart _nested_settings_selection_widgets[] = { }; static WindowDesc _settings_selection_desc( - WDP_CENTER, 510, 450, + WDP_CENTER, "settings", 510, 450, WC_GAME_OPTIONS, WC_NONE, 0, _nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets) @@ -2555,7 +2555,7 @@ static const NWidgetPart _nested_cust_currency_widgets[] = { }; static WindowDesc _cust_currency_desc( - WDP_CENTER, 0, 0, + WDP_CENTER, NULL, 0, 0, WC_CUSTOM_CURRENCY, WC_NONE, 0, _nested_cust_currency_widgets, lengthof(_nested_cust_currency_widgets) diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 2290f621a6..1ff2a75247 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -370,7 +370,7 @@ static const NWidgetPart _nested_sign_list_widgets[] = { }; static WindowDesc _sign_list_desc( - WDP_AUTO, 358, 138, + WDP_AUTO, "list_signs", 358, 138, WC_SIGN_LIST, WC_NONE, 0, _nested_sign_list_widgets, lengthof(_nested_sign_list_widgets) @@ -532,7 +532,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = { }; static WindowDesc _query_sign_edit_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "query_sign", 0, 0, WC_QUERY_STRING, WC_NONE, WDF_CONSTRUCTION, _nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index bc984ce639..f79b0cec61 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1777,7 +1777,7 @@ static const NWidgetPart _nested_smallmap_widgets[] = { }; static WindowDesc _smallmap_desc( - WDP_AUTO, 484, 314, + WDP_AUTO, "smallmap", 484, 314, WC_SMALLMAP, WC_NONE, 0, _nested_smallmap_widgets, lengthof(_nested_smallmap_widgets) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index c7c033fbf9..f6519fc4b9 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -712,7 +712,7 @@ static const NWidgetPart _nested_company_stations_widgets[] = { }; static WindowDesc _company_stations_desc( - WDP_AUTO, 358, 162, + WDP_AUTO, "list_stations", 358, 162, WC_STATION_LIST, WC_NONE, 0, _nested_company_stations_widgets, lengthof(_nested_company_stations_widgets) @@ -1184,7 +1184,7 @@ struct StationViewWindow : public Window { static WindowDesc _station_view_desc( - WDP_AUTO, 249, 110, + WDP_AUTO, "view_station", 249, 110, WC_STATION_VIEW, WC_NONE, 0, _nested_station_view_widgets, lengthof(_nested_station_view_widgets) @@ -1428,7 +1428,7 @@ struct SelectStationWindow : Window { }; static WindowDesc _select_station_desc( - WDP_AUTO, 200, 180, + WDP_AUTO, "build_station_join", 200, 180, WC_SELECT_STATION, WC_NONE, WDF_CONSTRUCTION, _nested_select_station_widgets, lengthof(_nested_select_station_widgets) diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 9e24d781d1..62799e18bf 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -236,7 +236,7 @@ static const NWidgetPart _nested_main_status_widgets[] = { }; static WindowDesc _main_status_desc( - WDP_MANUAL, 640, 12, + WDP_MANUAL, NULL, 640, 12, WC_STATUS_BAR, WC_NONE, WDF_NO_FOCUS, _nested_main_status_widgets, lengthof(_nested_main_status_widgets) diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp index a53a8b3ba7..8506498b69 100644 --- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -239,7 +239,7 @@ static const NWidgetPart _nested_subsidies_list_widgets[] = { }; static WindowDesc _subsidies_list_desc( - WDP_AUTO, 500, 127, + WDP_AUTO, "list_subsidies", 500, 127, WC_SUBSIDIES_LIST, WC_NONE, 0, _nested_subsidies_list_widgets, lengthof(_nested_subsidies_list_widgets) diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 22efd7a39b..f3e1a005a9 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -342,7 +342,7 @@ static const NWidgetPart _nested_terraform_widgets[] = { }; static WindowDesc _terraform_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, "toolbar_landscape", 0, 0, WC_SCEN_LAND_GEN, WC_NONE, WDF_CONSTRUCTION, _nested_terraform_widgets, lengthof(_nested_terraform_widgets) @@ -740,7 +740,7 @@ Hotkey ScenarioEditorLandscapeGeneratio Hotkey *_terraform_editor_hotkeys = ScenarioEditorLandscapeGenerationWindow::terraform_editor_hotkeys; static WindowDesc _scen_edit_land_gen_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "toolbar_landscape_scen", 0, 0, WC_SCEN_LAND_GEN, WC_NONE, WDF_CONSTRUCTION, _nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets) diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp index 87b1add354..40fa471b20 100644 --- a/src/textfile_gui.cpp +++ b/src/textfile_gui.cpp @@ -43,7 +43,7 @@ static const NWidgetPart _nested_textfile_widgets[] = { /** Window definition for the textfile window */ static WindowDesc _textfile_desc( - WDP_CENTER, 630, 460, + WDP_CENTER, "textfile", 630, 460, WC_TEXTFILE, WC_NONE, 0, _nested_textfile_widgets, lengthof(_nested_textfile_widgets) diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 7bb8ca06c1..1be6a89f04 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -690,7 +690,7 @@ static const NWidgetPart _nested_timetable_widgets[] = { }; static WindowDesc _timetable_desc( - WDP_AUTO, 400, 130, + WDP_AUTO, "view_vehicle_timetable", 400, 130, WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW, WDF_CONSTRUCTION, _nested_timetable_widgets, lengthof(_nested_timetable_widgets) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 70326b682d..5f041a39f2 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1787,7 +1787,7 @@ static const NWidgetPart _nested_toolbar_normal_widgets[] = { }; static WindowDesc _toolb_normal_desc( - WDP_MANUAL, 640, 22, + WDP_MANUAL, NULL, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, WDF_NO_FOCUS, _nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets) @@ -2096,7 +2096,7 @@ static const NWidgetPart _nested_toolb_scen_widgets[] = { }; static WindowDesc _toolb_scen_desc( - WDP_MANUAL, 640, 22, + WDP_MANUAL, NULL, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, WDF_NO_FOCUS, _nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets) diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 676061594f..63f7be2b66 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -281,7 +281,7 @@ public: }; static WindowDesc _town_authority_desc( - WDP_AUTO, 317, 222, + WDP_AUTO, "view_town_authority", 317, 222, WC_TOWN_AUTHORITY, WC_NONE, 0, _nested_town_authority_widgets, lengthof(_nested_town_authority_widgets) @@ -551,7 +551,7 @@ static const NWidgetPart _nested_town_game_view_widgets[] = { }; static WindowDesc _town_game_view_desc( - WDP_AUTO, 260, TownViewWindow::WID_TV_HEIGHT_NORMAL, + WDP_AUTO, "view_town", 260, TownViewWindow::WID_TV_HEIGHT_NORMAL, WC_TOWN_VIEW, WC_NONE, 0, _nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets) @@ -582,7 +582,7 @@ static const NWidgetPart _nested_town_editor_view_widgets[] = { }; static WindowDesc _town_editor_view_desc( - WDP_AUTO, 260, TownViewWindow::WID_TV_HEIGHT_NORMAL, + WDP_AUTO, "view_town_scen", 260, TownViewWindow::WID_TV_HEIGHT_NORMAL, WC_TOWN_VIEW, WC_NONE, 0, _nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets) @@ -938,7 +938,7 @@ GUITownList::SortFunction * const TownDirectoryWindow::sorter_funcs[] = { }; static WindowDesc _town_directory_desc( - WDP_AUTO, 208, 202, + WDP_AUTO, "list_towns", 208, 202, WC_TOWN_DIRECTORY, WC_NONE, 0, _nested_town_directory_widgets, lengthof(_nested_town_directory_widgets) @@ -1179,7 +1179,7 @@ public: }; static WindowDesc _found_town_desc( - WDP_AUTO, 160, 162, + WDP_AUTO, "build_town", 160, 162, WC_FOUND_TOWN, WC_NONE, WDF_CONSTRUCTION, _nested_found_town_widgets, lengthof(_nested_found_town_widgets) diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index 449969c509..9e00552b68 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -147,7 +147,7 @@ static const NWidgetPart _nested_transparency_widgets[] = { }; static WindowDesc _transparency_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, "toolbar_transparency", 0, 0, WC_TRANSPARENCY_TOOLBAR, WC_NONE, 0, _nested_transparency_widgets, lengthof(_nested_transparency_widgets) diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp index 9f8d9e1899..d1429d1443 100644 --- a/src/tree_gui.cpp +++ b/src/tree_gui.cpp @@ -239,7 +239,7 @@ static const NWidgetPart _nested_build_trees_widgets[] = { }; static WindowDesc _build_trees_desc( - WDP_AUTO, 0, 0, + WDP_AUTO, "build_tree", 0, 0, WC_BUILD_TREES, WC_NONE, WDF_CONSTRUCTION, _nested_build_trees_widgets, lengthof(_nested_build_trees_widgets) diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 3f3b736c1d..248ccbaa09 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1000,7 +1000,7 @@ static const NWidgetPart _nested_vehicle_refit_widgets[] = { }; static WindowDesc _vehicle_refit_desc( - WDP_AUTO, 240, 174, + WDP_AUTO, "view_vehicle_refit", 240, 174, WC_VEHICLE_REFIT, WC_VEHICLE_VIEW, WDF_CONSTRUCTION, _nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets) @@ -1697,7 +1697,7 @@ public: }; static WindowDesc _vehicle_list_desc( - WDP_AUTO, 260, 246, + WDP_AUTO, "list_vehicles", 260, 246, WC_INVALID, WC_NONE, 0, _nested_vehicle_list, lengthof(_nested_vehicle_list) @@ -2202,7 +2202,7 @@ struct VehicleDetailsWindow : Window { /** Vehicle details window descriptor. */ static WindowDesc _train_vehicle_details_desc( - WDP_AUTO, 405, 178, + WDP_AUTO, "view_vehicle_details_train", 405, 178, WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW, 0, _nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets) @@ -2210,7 +2210,7 @@ static WindowDesc _train_vehicle_details_desc( /** Vehicle details window descriptor for other vehicles than a train. */ static WindowDesc _nontrain_vehicle_details_desc( - WDP_AUTO, 405, 113, + WDP_AUTO, "view_vehicle_details", 405, 113, WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW, 0, _nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets) @@ -2269,7 +2269,7 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = { /** Vehicle view window descriptor for all vehicles but trains. */ static WindowDesc _vehicle_view_desc( - WDP_AUTO, 250, 116, + WDP_AUTO, "view_vehicle", 250, 116, WC_VEHICLE_VIEW, WC_NONE, 0, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) @@ -2280,7 +2280,7 @@ static WindowDesc _vehicle_view_desc( * default_height are different for train view. */ static WindowDesc _train_view_desc( - WDP_AUTO, 250, 134, + WDP_AUTO, "view_vehicle_train", 250, 134, WC_VEHICLE_VIEW, WC_NONE, 0, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp index 8330d12a16..5a81b79783 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -154,7 +154,7 @@ public: }; static WindowDesc _extra_view_port_desc( - WDP_AUTO, 300, 268, + WDP_AUTO, "extra_viewport", 300, 268, WC_EXTRA_VIEW_PORT, WC_NONE, 0, _nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets) diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index f0d6239c31..0991fba426 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -171,7 +171,7 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = { /** The description of the waypoint view. */ static WindowDesc _waypoint_view_desc( - WDP_AUTO, 260, 118, + WDP_AUTO, "view_waypoint", 260, 118, WC_WAYPOINT_VIEW, WC_NONE, 0, _nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets) diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index b0beca0fe3..4a1ac8f08a 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -91,7 +91,7 @@ static const NWidgetPart _nested_dropdown_menu_widgets[] = { }; static WindowDesc _dropdown_desc( - WDP_MANUAL, 0, 0, + WDP_MANUAL, NULL, 0, 0, WC_DROPDOWN_MENU, WC_NONE, 0, _nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets) diff --git a/src/window.cpp b/src/window.cpp index 8e6a05028c..035050bcbe 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -73,7 +73,7 @@ bool _mouse_hovering; ///< The mouse is hovering over the same point. SpecialMouseMode _special_mouse_mode; ///< Mode of the mouse. /** Window description constructor. */ -WindowDesc::WindowDesc(WindowPosition def_pos, int16 def_width, int16 def_height, +WindowDesc::WindowDesc(WindowPosition def_pos, const char *ini_key, int16 def_width, int16 def_height, WindowClass window_class, WindowClass parent_class, uint32 flags, const NWidgetPart *nwid_parts, int16 nwid_length) : default_pos(def_pos), @@ -81,6 +81,7 @@ WindowDesc::WindowDesc(WindowPosition def_pos, int16 def_width, int16 def_height default_height(def_height), cls(window_class), parent_cls(parent_class), + ini_key(ini_key), flags(flags), nwid_parts(nwid_parts), nwid_length(nwid_length) diff --git a/src/window_gui.h b/src/window_gui.h index c21475442d..59df380522 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -165,7 +165,7 @@ Point GetToolbarAlignedWindowPosition(int window_width); */ struct WindowDesc : ZeroedMemoryAllocator { - WindowDesc(WindowPosition default_pos, int16 def_width, int16 def_height, + WindowDesc(WindowPosition default_pos, const char *ini_key, int16 def_width, int16 def_height, WindowClass window_class, WindowClass parent_class, uint32 flags, const NWidgetPart *nwid_parts, int16 nwid_length); @@ -176,6 +176,7 @@ struct WindowDesc : ZeroedMemoryAllocator { int16 default_height; ///< Preferred initial height of the window. WindowClass cls; ///< Class of the window, @see WindowClass. WindowClass parent_cls; ///< Class of the parent window. @see WindowClass + const char *ini_key; ///< Key to store window defaults in openttd.cfg. \c NULL if nothing shall be stored. uint32 flags; ///< Flags. @see WindowDefaultFlag const NWidgetPart *nwid_parts; ///< Nested widget parts describing the window. int16 nwid_length; ///< Length of the #nwid_parts array.