diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-17 19:16:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-17 19:16:48 +0000 |
| commit | 5f2ddfbc5aa2674124e7af62d405a4d76cdfb0e2 (patch) | |
| tree | 555dcdb99e5bae8aea6350713c53469486f925c7 | |
| parent | 063e8adcecff0818dfb64f7640b11a1b7b982d08 (diff) | |
| download | openttd-5f2ddfbc5aa2674124e7af62d405a4d76cdfb0e2.tar.xz | |
(svn r18152) -Codechange: remove the 'minimum window size' from the WindowDesc; it's determined from the (nested) widgets
47 files changed, 140 insertions, 144 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index d316a011a..737b39ebc 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -231,7 +231,7 @@ static const NWidgetPart _nested_ai_list_widgets[] = { /* Window definition for the ai list window. */ static const WindowDesc _ai_list_desc( - WDP_CENTER, WDP_CENTER, 200, 234, 200, 234, + WDP_CENTER, WDP_CENTER, 200, 234, WC_AI_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_ai_list_widgets, lengthof(_nested_ai_list_widgets) @@ -428,7 +428,7 @@ static const NWidgetPart _nested_ai_settings_widgets[] = { /* Window definition for the AI settings window. */ static const WindowDesc _ai_settings_desc( - WDP_CENTER, WDP_CENTER, 200, 208, 500, 208, + WDP_CENTER, WDP_CENTER, 500, 208, WC_AI_SETTINGS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets) @@ -478,7 +478,7 @@ static const NWidgetPart _nested_ai_config_widgets[] = { /* Window definition for the configure AI window. */ static const WindowDesc _ai_config_desc( - WDP_CENTER, WDP_CENTER, 300, 172, 300, 172, + WDP_CENTER, WDP_CENTER, 300, 172, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_ai_config_widgets, lengthof(_nested_ai_config_widgets) @@ -951,7 +951,7 @@ static const NWidgetPart _nested_ai_debug_widgets[] = { }; static const WindowDesc _ai_debug_desc( - WDP_AUTO, WDP_AUTO, 299, 241, 299, 241, + WDP_AUTO, WDP_AUTO, 299, 241, WC_AI_DEBUG, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets) diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 2fec6b439..3ef1c4423 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -151,7 +151,7 @@ static const NWidgetPart _nested_air_toolbar_widgets[] = { }; static const WindowDesc _air_toolbar_desc( - WDP_ALIGN_TBR, 22, 64, 36, 64, 36, + WDP_ALIGN_TBR, 22, 64, 36, WC_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets) @@ -384,7 +384,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = { }; static const WindowDesc _build_airport_desc( - WDP_AUTO, WDP_AUTO, 148, 245, 148, 245, + WDP_AUTO, WDP_AUTO, 148, 245, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_airport_widgets, lengthof(_nested_build_airport_widgets) diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 7e1d78cb2..6f34aef39 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -520,7 +520,7 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = { }; static const WindowDesc _replace_rail_vehicle_desc( - WDP_AUTO, WDP_AUTO, 456, 140, 456, 140, + WDP_AUTO, WDP_AUTO, 456, 140, WC_REPLACE_VEHICLE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets) @@ -551,7 +551,7 @@ static const NWidgetPart _nested_replace_vehicle_widgets[] = { }; static const WindowDesc _replace_vehicle_desc( - WDP_AUTO, WDP_AUTO, 456, 118, 456, 118, + WDP_AUTO, WDP_AUTO, 456, 118, WC_REPLACE_VEHICLE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets) diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index 73359d8e9..be2ac9643 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -337,7 +337,7 @@ static const NWidgetPart _nested_build_bridge_widgets[] = { /* Window definition for the rail bridge selection window */ static const WindowDesc _build_bridge_desc( - WDP_AUTO, WDP_AUTO, 200, 114, 200, 114, + WDP_AUTO, WDP_AUTO, 200, 114, WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | 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 89dabbb15..63762ca45 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1184,7 +1184,7 @@ struct BuildVehicleWindow : Window { }; static const WindowDesc _build_vehicle_desc( - WDP_AUTO, WDP_AUTO, 240, 186, 240, 268, + WDP_AUTO, WDP_AUTO, 240, 268, WC_BUILD_VEHICLE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets) diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index 878f1edfe..b995d77f1 100644 --- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -308,7 +308,7 @@ struct CheatWindow : Window { }; static const WindowDesc _cheats_desc( - 240, 22, 0, 0, 0, 0, + 240, 22, 0, 0, WC_CHEATS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_cheat_widgets, lengthof(_nested_cheat_widgets) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 5ac2d06dc..40daa7aac 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -457,7 +457,7 @@ struct CompanyFinancesWindow : Window { }; static const WindowDesc _company_finances_desc( - WDP_AUTO, WDP_AUTO, 0, 0, 0, 0, + WDP_AUTO, WDP_AUTO, 0, 0, WC_FINANCES, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, _nested_company_finances_widgets, lengthof(_nested_company_finances_widgets) @@ -797,7 +797,7 @@ static const NWidgetPart _nested_select_company_livery_widgets [] = { }; static const WindowDesc _select_company_livery_desc( - WDP_AUTO, WDP_AUTO, 0, 0, 0, 0, + WDP_AUTO, WDP_AUTO, 0, 0, WC_COMPANY_COLOUR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets) @@ -1378,7 +1378,7 @@ public: /** normal/simple company manager face selection window description */ static const WindowDesc _select_company_manager_face_desc( - WDP_AUTO, WDP_AUTO, 190, 163, 190, 163, + WDP_AUTO, WDP_AUTO, 190, 163, WC_COMPANY_MANAGER_FACE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets) @@ -1386,7 +1386,7 @@ static const WindowDesc _select_company_manager_face_desc( /** advanced company manager face selection window description */ static const WindowDesc _select_company_manager_face_adv_desc( - WDP_AUTO, WDP_AUTO, 220, 220, 220, 220, + WDP_AUTO, WDP_AUTO, 220, 220, WC_COMPANY_MANAGER_FACE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_select_company_manager_face_adv_widgets, lengthof(_nested_select_company_manager_face_adv_widgets) @@ -1815,7 +1815,7 @@ struct CompanyWindow : Window }; static const WindowDesc _company_desc( - WDP_AUTO, WDP_AUTO, 360, 170, 360, 170, + WDP_AUTO, WDP_AUTO, 360, 170, WC_COMPANY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_company_widgets, lengthof(_nested_company_widgets) @@ -1927,7 +1927,7 @@ static const NWidgetPart _nested_buy_company_widgets[] = { }; static const WindowDesc _buy_company_desc( - 153, 171, 334, 137, 334, 137, + 153, 171, 334, 137, WC_BUY_COMPANY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_buy_company_widgets, lengthof(_nested_buy_company_widgets) diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 8de4b43aa..4a8a28b24 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -158,7 +158,7 @@ static const struct NWidgetPart _nested_console_window_widgets[] = { }; static const WindowDesc _console_window_desc( - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, WC_CONSOLE, WC_NONE, 0, _nested_console_window_widgets, lengthof(_nested_console_window_widgets) diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index b3b21cdd1..d7e4ce346 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -92,28 +92,28 @@ static const NWidgetPart _nested_train_depot_widgets[] = { }; static const WindowDesc _train_depot_desc( - WDP_AUTO, WDP_AUTO, 36, 27, 362, 123, + WDP_AUTO, WDP_AUTO, 362, 123, WC_VEHICLE_DEPOT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _road_depot_desc( - WDP_AUTO, WDP_AUTO, 36, 27, 316, 97, + WDP_AUTO, WDP_AUTO, 316, 97, WC_VEHICLE_DEPOT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _ship_depot_desc( - WDP_AUTO, WDP_AUTO, 36, 27, 306, 99, + WDP_AUTO, WDP_AUTO, 306, 99, WC_VEHICLE_DEPOT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _aircraft_depot_desc( - WDP_AUTO, WDP_AUTO, 36, 27, 332, 99, + WDP_AUTO, WDP_AUTO, 332, 99, WC_VEHICLE_DEPOT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index b538a5f9a..347c8ee80 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -285,7 +285,7 @@ static const NWidgetPart _nested_build_docks_toolbar_widgets[] = { }; static const WindowDesc _build_docks_toolbar_desc( - WDP_ALIGN_TBR, 22, 160, 36, 160, 36, + WDP_ALIGN_TBR, 22, 160, 36, WC_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_docks_toolbar_widgets, lengthof(_nested_build_docks_toolbar_widgets) @@ -321,7 +321,7 @@ static const NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = { /** Window definition for the build docks in scenario editor window. */ static const WindowDesc _build_docks_scen_toolbar_desc( - WDP_AUTO, WDP_AUTO, 115, 36, 115, 36, + WDP_AUTO, WDP_AUTO, 115, 36, WC_SCEN_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets) @@ -418,7 +418,7 @@ static const NWidgetPart _nested_build_dock_station_widgets[] = { }; static const WindowDesc _build_dock_station_desc( - WDP_AUTO, WDP_AUTO, 148, 75, 148, 75, + WDP_AUTO, WDP_AUTO, 148, 75, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_dock_station_widgets, lengthof(_nested_build_dock_station_widgets) @@ -504,7 +504,7 @@ static const NWidgetPart _nested_build_docks_depot_widgets[] = { }; static const WindowDesc _build_docks_depot_desc( - WDP_AUTO, WDP_AUTO, 204, 86, 204, 86, + WDP_AUTO, WDP_AUTO, 204, 86, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | 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 60343bfb8..ed7df0869 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -124,7 +124,7 @@ struct EnginePreviewWindow : Window { }; static const WindowDesc _engine_preview_desc( - WDP_CENTER, WDP_CENTER, 300, 192, 300, 192, + WDP_CENTER, WDP_CENTER, 300, 192, WC_ENGINE_PREVIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets) diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index e7f4ab1ee..4239283f7 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -767,14 +767,14 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { }; static const WindowDesc _generate_landscape_desc( - WDP_CENTER, WDP_CENTER, 338, 313, 338, 313, + WDP_CENTER, WDP_CENTER, 338, 313, WC_GENERATE_LANDSCAPE, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets) ); static const WindowDesc _heightmap_load_desc( - WDP_CENTER, WDP_CENTER, 338, 236, 338, 236, + WDP_CENTER, WDP_CENTER, 338, 236, WC_GENERATE_LANDSCAPE, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS, _nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets) @@ -1087,7 +1087,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = { }; static const WindowDesc _create_scenario_desc( - WDP_CENTER, WDP_CENTER, 338, 170, 338, 170, + WDP_CENTER, WDP_CENTER, 338, 170, WC_GENERATE_LANDSCAPE, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS, _nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets) @@ -1122,7 +1122,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = { static const WindowDesc _generate_progress_desc( - WDP_CENTER, WDP_CENTER, 181, 97, 181, 97, + WDP_CENTER, WDP_CENTER, 181, 97, WC_GENERATE_PROGRESS_WINDOW, WC_NONE, WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 32144b8dc..603d5f28a 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -140,7 +140,7 @@ static const NWidgetPart _nested_graph_legend_widgets[] = { }; static const WindowDesc _graph_legend_desc( - WDP_AUTO, WDP_AUTO, 250, 196, 250, 196, + WDP_AUTO, WDP_AUTO, 250, 196, WC_GRAPH_LEGEND, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_graph_legend_widgets, lengthof(_nested_graph_legend_widgets) @@ -526,7 +526,7 @@ static const NWidgetPart _nested_operating_profit_widgets[] = { }; static const WindowDesc _operating_profit_desc( - WDP_AUTO, WDP_AUTO, 576, 174, 576, 174, + WDP_AUTO, WDP_AUTO, 576, 174, WC_OPERATING_PROFIT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets) @@ -567,7 +567,7 @@ static const NWidgetPart _nested_income_graph_widgets[] = { static const WindowDesc _income_graph_desc( - WDP_AUTO, WDP_AUTO, 576, 142, 576, 142, + WDP_AUTO, WDP_AUTO, 576, 142, WC_INCOME_GRAPH, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_income_graph_widgets, lengthof(_nested_income_graph_widgets) @@ -605,7 +605,7 @@ static const NWidgetPart _nested_delivered_cargo_graph_widgets[] = { }; static const WindowDesc _delivered_cargo_graph_desc( - WDP_AUTO, WDP_AUTO, 576, 142, 576, 142, + WDP_AUTO, WDP_AUTO, 576, 142, WC_DELIVERED_CARGO, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets) @@ -659,7 +659,7 @@ static const NWidgetPart _nested_performance_history_widgets[] = { }; static const WindowDesc _performance_history_desc( - WDP_AUTO, WDP_AUTO, 576, 238, 576, 238, + WDP_AUTO, WDP_AUTO, 576, 238, WC_PERFORMANCE_HISTORY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_performance_history_widgets, lengthof(_nested_performance_history_widgets) @@ -697,7 +697,7 @@ static const NWidgetPart _nested_company_value_graph_widgets[] = { }; static const WindowDesc _company_value_graph_desc( - WDP_AUTO, WDP_AUTO, 576, 238, 576, 238, + WDP_AUTO, WDP_AUTO, 576, 238, WC_COMPANY_VALUE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets) @@ -859,7 +859,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { }; static const WindowDesc _cargo_payment_rates_desc( - WDP_AUTO, WDP_AUTO, 568, 46, 568, 46, + WDP_AUTO, WDP_AUTO, 568, 46, WC_PAYMENT_RATES, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets) @@ -996,7 +996,7 @@ static const NWidgetPart _nested_company_league_widgets[] = { }; static const WindowDesc _company_league_desc( - WDP_AUTO, WDP_AUTO, 400, 167, 400, 167, + WDP_AUTO, WDP_AUTO, 400, 167, WC_COMPANY_LEAGUE, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, _nested_company_league_widgets, lengthof(_nested_company_league_widgets) @@ -1279,7 +1279,7 @@ static const NWidgetPart _nested_performance_rating_detail_widgets[] = { }; static const WindowDesc _performance_rating_detail_desc( - WDP_AUTO, WDP_AUTO, 299, 241, 299, 241, + WDP_AUTO, WDP_AUTO, 299, 241, WC_PERFORMANCE_DETAIL, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_performance_rating_detail_widgets, lengthof(_nested_performance_rating_detail_widgets) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 8fe54f9f0..8b98364e4 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -674,14 +674,14 @@ public: static WindowDesc _other_group_desc( - WDP_AUTO, WDP_AUTO, 460, 194, 460, 246, + WDP_AUTO, WDP_AUTO, 460, 246, WC_INVALID, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_group_widgets, lengthof(_nested_group_widgets) ); const static WindowDesc _train_group_desc( - WDP_AUTO, WDP_AUTO, 525, 194, 525, 246, + WDP_AUTO, WDP_AUTO, 525, 246, WC_TRAINS_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_group_widgets, lengthof(_nested_group_widgets) diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index d23e3310e..acbdc4804 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -179,14 +179,14 @@ static const NWidgetPart _nested_highscore_widgets[] = { }; static const WindowDesc _highscore_desc( - 0, 0, 641, 481, 641, 481, + 0, 0, 641, 481, WC_HIGHSCORE, WC_NONE, 0, _nested_highscore_widgets, lengthof(_nested_highscore_widgets) ); static const WindowDesc _endgame_desc( - 0, 0, 641, 481, 641, 481, + 0, 0, 641, 481, 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 7d239f6bb..10900612f 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -125,7 +125,7 @@ static const NWidgetPart _nested_build_industry_widgets[] = { /** Window definition of the dynamic place industries gui */ static const WindowDesc _build_industry_desc( - WDP_AUTO, WDP_AUTO, 170, 212, 170, 212, + WDP_AUTO, WDP_AUTO, 170, 212, WC_BUILD_INDUSTRY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_build_industry_widgets, lengthof(_nested_build_industry_widgets) @@ -820,7 +820,7 @@ static const NWidgetPart _nested_industry_view_widgets[] = { /** Window definition of the view industy gui */ static const WindowDesc _industry_view_desc( - WDP_AUTO, WDP_AUTO, 260, 120, 260, 120, + WDP_AUTO, WDP_AUTO, 260, 120, WC_INDUSTRY_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_industry_view_widgets, lengthof(_nested_industry_view_widgets) @@ -1196,7 +1196,7 @@ const StringID IndustryDirectoryWindow::sorter_names[] = { /** Window definition of the industy directory gui */ static const WindowDesc _industry_directory_desc( - WDP_AUTO, WDP_AUTO, 428, 190, 428, 190, + WDP_AUTO, WDP_AUTO, 428, 190, WC_INDUSTRY_DIRECTORY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets) diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 4aca99a20..71d0eca78 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -251,7 +251,7 @@ static const NWidgetPart _nested_select_game_widgets[] = { }; static const WindowDesc _select_game_desc( - WDP_CENTER, WDP_CENTER, 336, 213, 336, 213, + WDP_CENTER, WDP_CENTER, 336, 213, WC_SELECT_GAME, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_select_game_widgets, lengthof(_nested_select_game_widgets) diff --git a/src/main_gui.cpp b/src/main_gui.cpp index bf7dd90e1..a55260459 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -200,7 +200,7 @@ static const struct NWidgetPart _nested_main_window_widgets[] = { }; static const WindowDesc _main_window_desc( - 0, 0, 0, 0, 0, 0, + 0, 0, 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 7b32704b5..ce8e3df16 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -72,7 +72,7 @@ static const NWidgetPart _nested_land_info_widgets[] = { }; static const WindowDesc _land_info_desc( - WDP_AUTO, WDP_AUTO, 0, 0, 0, 0, + WDP_AUTO, WDP_AUTO, 0, 0, WC_LAND_INFO, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_land_info_widgets, lengthof(_nested_land_info_widgets) @@ -346,7 +346,7 @@ static const NWidgetPart _nested_about_widgets[] = { }; static const WindowDesc _about_desc( - WDP_CENTER, WDP_CENTER, 0, 0, 0, 0, + WDP_CENTER, WDP_CENTER, 0, 0, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_about_widgets, lengthof(_nested_about_widgets) @@ -507,7 +507,7 @@ static const NWidgetPart _nested_errmsg_widgets[] = { }; static const WindowDesc _errmsg_desc( - 0, 0, 240, 46, 240, 46, // x/y position is not used. + 0, 0, 240, 46, // x/y position is not used. WC_ERRMSG, WC_NONE, WDF_STD_BTN | WDF_DEF_WIDGET, _nested_errmsg_widgets, lengthof(_nested_errmsg_widgets) @@ -527,7 +527,7 @@ static const NWidgetPart _nested_errmsg_face_widgets[] = { }; static const WindowDesc _errmsg_face_desc( - 0, 0, 334, 137, 334, 137, // x/y position is not used. + 0, 0, 334, 137, // x/y position is not used. WC_ERRMSG, WC_NONE, WDF_STD_BTN | WDF_DEF_WIDGET, _nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets) @@ -774,7 +774,7 @@ static const NWidgetPart _nested_tooltips_widgets[] = { }; static const WindowDesc _tool_tips_desc( - 100, 100, 0, 0, 0, 0, // Coordinates and sizes are not used, + 100, 100, 0, 0, // Coordinates and sizes are not used, WC_TOOLTIPS, WC_NONE, 0, _nested_tooltips_widgets, lengthof(_nested_tooltips_widgets) @@ -1440,7 +1440,7 @@ static const NWidgetPart _nested_query_string_widgets[] = { }; static const WindowDesc _query_string_desc( - 190, 219, 260, 42, 260, 42, + 190, 219, 260, 42, WC_QUERY_STRING, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, _nested_query_string_widgets, lengthof(_nested_query_string_widgets) @@ -1595,7 +1595,7 @@ static const NWidgetPart _nested_query_widgets[] = { }; static const WindowDesc _query_desc( - WDP_CENTER, WDP_CENTER, 210, 82, 210, 82, + WDP_CENTER, WDP_CENTER, 210, 82, WC_CONFIRM_POPUP_QUERY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_DEF_WIDGET | WDF_MODAL, _nested_query_widgets, lengthof(_nested_query_widgets) @@ -2038,14 +2038,14 @@ public: }; static const WindowDesc _load_dialog_desc( - WDP_CENTER, WDP_CENTER, 257, 154, 257, 294, + WDP_CENTER, WDP_CENTER, 257, 294, WC_SAVELOAD, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets) ); static const WindowDesc _save_dialog_desc( - WDP_CENTER, WDP_CENTER, 257, 180, 257, 320, + WDP_CENTER, WDP_CENTER, 257, 320, WC_SAVELOAD, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets) diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 37fa6baba..8ff9f1624 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -410,7 +410,7 @@ static const NWidgetPart _nested_music_track_selection_widgets[] = { }; static const WindowDesc _music_track_selection_desc( - 104, 131, 432, 218, 432, 218, + 104, 131, 432, 218, WC_MUSIC_TRACK_SELECTION, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets) @@ -672,7 +672,7 @@ static const NWidgetPart _nested_music_window_widgets[] = { }; static const WindowDesc _music_window_desc( - 0, 22, 300, 66, 300, 66, + 0, 22, 300, 66, WC_MUSIC_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _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 242048b1f..731375b4d 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -543,7 +543,7 @@ static const NWidgetPart _nested_chat_window_widgets[] = { }; static const WindowDesc _chat_window_desc( - WDP_CENTER, 0, 320, 14, 640, 14, // x, y, width, height + WDP_CENTER, 0, 640, 14, // x, y, width, height WC_SEND_NETWORK_MSG, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET, _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 fbe7197f9..dc24eaee3 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -47,7 +47,7 @@ static const NWidgetPart _nested_network_content_download_status_window_widgets[ /** Window description for the download window */ static const WindowDesc _network_content_download_status_window_desc( - WDP_CENTER, WDP_CENTER, 350, 85, 350, 85, + WDP_CENTER, WDP_CENTER, 350, 85, WC_NETWORK_STATUS_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL, _nested_network_content_download_status_window_widgets, lengthof(_nested_network_content_download_status_window_widgets) @@ -868,7 +868,7 @@ static const NWidgetPart _nested_network_content_list_widgets[] = { /** Window description of the content list */ static const WindowDesc _network_content_list_desc( - WDP_CENTER, WDP_CENTER, 450, 278, 630, 460, + WDP_CENTER, WDP_CENTER, 630, 460, WC_NETWORK_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _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 434fdb6d7..b84701972 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1001,7 +1001,7 @@ static const NWidgetPart _nested_network_game_widgets[] = { }; static const WindowDesc _network_game_window_desc( - WDP_CENTER, WDP_CENTER, 450, 264, 1000, 730, + WDP_CENTER, WDP_CENTER, 1000, 730, WC_NETWORK_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_network_game_widgets, lengthof(_nested_network_game_widgets) @@ -1418,7 +1418,7 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = { }; static const WindowDesc _network_start_server_window_desc( - WDP_CENTER, WDP_CENTER, 420, 244, 420, 244, + WDP_CENTER, WDP_CENTER, 420, 244, WC_NETWORK_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets) @@ -1709,7 +1709,7 @@ static const NWidgetPart _nested_network_lobby_window_widgets[] = { }; static const WindowDesc _network_lobby_window_desc( - WDP_CENTER, WDP_CENTER, 0, 0, 0, 0, + WDP_CENTER, WDP_CENTER, 0, 0, WC_NETWORK_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets) @@ -1752,7 +1752,7 @@ static const NWidgetPart _nested_client_list_popup_widgets[] = { }; static const WindowDesc _client_list_popup_desc( - WDP_AUTO, WDP_AUTO, 150, 1, 150, 1, + WDP_AUTO, WDP_AUTO, 150, 1, WC_TOOLBAR_MENU, WC_CLIENT_LIST, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET, _nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets) @@ -1968,7 +1968,7 @@ static const NWidgetPart _nested_client_list_widgets[] = { }; static const WindowDesc _client_list_desc( - WDP_AUTO, WDP_AUTO, 250, 16, 250, 16, + WDP_AUTO, WDP_AUTO, 250, 16, WC_CLIENT_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_client_list_widgets, lengthof(_nested_client_list_widgets) @@ -2207,7 +2207,7 @@ static const NWidgetPart _nested_network_join_status_window_widgets[] = { }; static const WindowDesc _network_join_status_window_desc( - WDP_CENTER, WDP_CENTER, 250, 85, 250, 85, + WDP_CENTER, WDP_CENTER, 250, 85, WC_NETWORK_STATUS_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL, _nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets) @@ -2332,7 +2332,7 @@ static const NWidgetPart _nested_network_company_password_window_widgets[] = { }; static const WindowDesc _network_company_password_window_desc( - WDP_AUTO, WDP_AUTO, 300, 63, 300, 63, + WDP_AUTO, WDP_AUTO, 300, 63, WC_COMPANY_PASSWORD_WINDOW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, _nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets) diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 53348f0e7..2b1b10c52 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -487,7 +487,7 @@ static const NWidgetPart _nested_newgrf_add_dlg_widgets[] = { /* Window definition for the add a newgrf window */ static const WindowDesc _newgrf_add_dlg_desc( - WDP_CENTER, WDP_CENTER, 0, 0, 306, 347, + WDP_CENTER, WDP_CENTER, 306, 347, WC_SAVELOAD, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_newgrf_add_dlg_widgets, lengthof(_nested_newgrf_add_dlg_widgets) @@ -1041,7 +1041,7 @@ static const NWidgetPart _nested_newgrf_widgets[] = { /* Window definition of the manage newgrfs window */ static const WindowDesc _newgrf_desc( - WDP_CENTER, WDP_CENTER, 300, 263, 300, 263, + WDP_CENTER, WDP_CENTER, 300, 263, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, _nested_newgrf_widgets, lengthof(_nested_newgrf_widgets) diff --git a/src/news_gui.cpp b/src/news_gui.cpp index ba6cf2059..5e98a0f6a 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -106,7 +106,7 @@ static const NWidgetPart _nested_normal_news_widgets[] = { }; static WindowDesc _normal_news_desc( - WDP_CENTER, 476, 430, 170, 430, 170, + WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, WDF_DEF_WIDGET, _nested_normal_news_widgets, lengthof(_nested_normal_news_widgets) @@ -133,7 +133,7 @@ static const NWidgetPart _nested_vehicle_news_widgets[] = { }; static WindowDesc _vehicle_news_desc( - WDP_CENTER, 476, 430, 170, 430, 170, + WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, WDF_DEF_WIDGET, _nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets) @@ -164,7 +164,7 @@ static const NWidgetPart _nested_company_news_widgets[] = { }; static WindowDesc _company_news_desc( - WDP_CENTER, 476, 430, 170, 430, 170, + WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, WDF_DEF_WIDGET, _nested_company_news_widgets, lengthof(_nested_company_news_widgets) @@ -187,7 +187,7 @@ static const NWidgetPart _nested_thin_news_widgets[] = { }; static WindowDesc _thin_news_desc( - WDP_CENTER, 476, 430, 130, 430, 130, + WDP_CENTER, 476, 430, 130, WC_NEWS_WINDOW, WC_NONE, WDF_DEF_WIDGET, _nested_thin_news_widgets, lengthof(_nested_thin_news_widgets) @@ -211,7 +211,7 @@ static NWidgetPart _nested_small_news_widgets[] = { }; static WindowDesc _small_news_desc( - WDP_CENTER, 476, 280, 87, 280, 87, + WDP_CENTER, 476, 280, 87, WC_NEWS_WINDOW, WC_NONE, WDF_DEF_WIDGET, _nested_small_news_widgets, lengthof(_nested_small_news_widgets) @@ -1019,7 +1019,7 @@ static const NWidgetPart _nested_message_history[] = { }; static const WindowDesc _message_history_desc( - 240, 22, 400, 140, 400, 140, + 240, 22, 400, 140, WC_MESSAGE_HISTORY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_message_history, lengthof(_nested_message_history) @@ -1307,7 +1307,7 @@ static const NWidgetPart _nested_message_options_widgets[] = { }; static const WindowDesc _message_options_desc( - 270, 22, 0, 0, 0, 0, + 270, 22, 0, 0, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_message_options_widgets, lengthof(_nested_message_options_widgets) diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 1cb88c346..615677b9f 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1339,7 +1339,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = { }; static const WindowDesc _orders_train_desc( - WDP_AUTO, WDP_AUTO, 384, 100, 384, 100, + WDP_AUTO, WDP_AUTO, 384, 100, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_orders_train_widgets, lengthof(_nested_orders_train_widgets) @@ -1403,7 +1403,7 @@ static const NWidgetPart _nested_orders_widgets[] = { }; static const WindowDesc _orders_desc( - WDP_AUTO, WDP_AUTO, 384, 100, 384, 100, + WDP_AUTO, WDP_AUTO, 384, 100, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_orders_widgets, lengthof(_nested_orders_widgets) @@ -1429,7 +1429,7 @@ static const NWidgetPart _nested_other_orders_widgets[] = { }; static const WindowDesc _other_orders_desc( - WDP_AUTO, WDP_AUTO, 384, 86, 384, 86, + WDP_AUTO, WDP_AUTO, 384, 86, WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_other_orders_widgets, lengthof(_nested_other_orders_widgets) diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 6f4822ef4..02d626846 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -386,7 +386,7 @@ static const NWidgetPart _nested_osk_widgets[] = { }; static const WindowDesc _osk_desc( - WDP_CENTER, WDP_CENTER, 256, 140, 256, 140, + WDP_CENTER, WDP_CENTER, 256, 140, WC_OSK, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_osk_widgets, lengthof(_nested_osk_widgets) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 136ffc330..ccf74d865 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -859,7 +859,7 @@ static const NWidgetPart _nested_build_rail_widgets[] = { }; static const WindowDesc _build_rail_desc( - WDP_ALIGN_TBR, 22, 350, 36, 350, 36, + WDP_ALIGN_TBR, 22, 350, 36, WC_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_rail_widgets, lengthof(_nested_build_rail_widgets) @@ -1469,7 +1469,7 @@ static const NWidgetPart _nested_newstation_builder_widgets[] = { /** High level window description of the default station-build window */ static const WindowDesc _station_builder_desc( - WDP_AUTO, WDP_AUTO, 148, 200, 148, 200, + WDP_AUTO, WDP_AUTO, 148, 200, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_station_builder_widgets, lengthof(_nested_station_builder_widgets) @@ -1477,7 +1477,7 @@ static const WindowDesc _station_builder_desc( /** High level window description of the newGRF station-build window */ static const WindowDesc _newstation_builder_desc( - WDP_AUTO, WDP_AUTO, 148, 290, 148, 290, + WDP_AUTO, WDP_AUTO, 148, 290, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_newstation_builder_widgets, lengthof(_nested_newstation_builder_widgets) @@ -1684,7 +1684,7 @@ static const NWidgetPart _nested_signal_builder_widgets[] = { /** Signal selection window description */ static const WindowDesc _signal_builder_desc( - WDP_AUTO, WDP_AUTO, 154, 68, 154, 68, + WDP_AUTO, WDP_AUTO, 154, 68, WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets) @@ -1777,7 +1777,7 @@ static const NWidgetPart _nested_build_depot_widgets[] = { }; static const WindowDesc _build_depot_desc( - WDP_AUTO, WDP_AUTO, 140, 122, 140, 122, + WDP_AUTO, WDP_AUTO, 140, 122, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_depot_widgets, lengthof(_nested_build_depot_widgets) @@ -1880,7 +1880,7 @@ static const NWidgetPart _nested_build_waypoint_widgets[] = { }; static const WindowDesc _build_waypoint_desc( - WDP_AUTO, WDP_AUTO, 344, 92, 344, 92, + WDP_AUTO, WDP_AUTO, 344, 92, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_waypoint_widgets, lengthof(_nested_build_waypoint_widgets) diff --git a/src/road_gui.cpp b/src/road_gui.cpp index e56edbe59..0c89f7366 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -663,7 +663,7 @@ static const NWidgetPart _nested_build_road_widgets[] = { }; static const WindowDesc _build_road_desc( - WDP_ALIGN_TBR, 22, 263, 36, 263, 36, + WDP_ALIGN_TBR, 22, 263, 36, WC_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_road_widgets, lengthof(_nested_build_road_widgets) @@ -701,7 +701,7 @@ static const NWidgetPart _nested_build_tramway_widgets[] = { }; static const WindowDesc _build_tramway_desc( - WDP_ALIGN_TBR, 22, 241, 36, 241, 36, + WDP_ALIGN_TBR, 22, 241, 36, WC_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets) @@ -743,7 +743,7 @@ static const NWidgetPart _nested_build_road_scen_widgets[] = { }; static const WindowDesc _build_road_scen_desc( - WDP_AUTO, WDP_AUTO, 197, 36, 197, 36, + WDP_AUTO, WDP_AUTO, 197, 36, WC_SCEN_BUILD_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets) @@ -843,7 +843,7 @@ static const NWidgetPart _nested_build_road_depot_widgets[] = { }; static const WindowDesc _build_road_depot_desc( - WDP_AUTO, WDP_AUTO, 140, 122, 140, 122, + WDP_AUTO, WDP_AUTO, 140, 122, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_road_depot_widgets, lengthof(_nested_build_road_depot_widgets) @@ -1008,7 +1008,7 @@ static const NWidgetPart _nested_rv_station_picker_widgets[] = { }; static const WindowDesc _rv_station_picker_desc( - WDP_AUTO, WDP_AUTO, 207, 178, 207, 178, + WDP_AUTO, WDP_AUTO, 207, 178, WC_BUS_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | 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 b65770cbd..e5f2ccbaa 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -489,7 +489,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { }; static const WindowDesc _game_options_desc( - WDP_CENTER, WDP_CENTER, 370, 249, 370, 249, + WDP_CENTER, WDP_CENTER, 370, 249, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_game_options_widgets, lengthof(_nested_game_options_widgets) @@ -767,7 +767,7 @@ static const NWidgetPart _nested_game_difficulty_widgets[] = { /** Window definition for the game difficulty settings window */ static const WindowDesc _game_difficulty_desc( - WDP_CENTER, WDP_CENTER, 370, 279, 370, 279, + WDP_CENTER, WDP_CENTER, 370, 279, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_game_difficulty_widgets, lengthof(_nested_game_difficulty_widgets) @@ -1652,7 +1652,7 @@ static const NWidgetPart _nested_settings_selection_widgets[] = { }; static const WindowDesc _settings_selection_desc( - WDP_CENTER, WDP_CENTER, 412, 188, 450, 397, + WDP_CENTER, WDP_CENTER, 450, 397, WC_GAME_OPTIONS, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE, _nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets) @@ -1934,7 +1934,7 @@ static const NWidgetPart _nested_cust_currency_widgets[] = { }; static const WindowDesc _cust_currency_desc( - WDP_CENTER, WDP_CENTER, 230, 120, 230, 120, + WDP_CENTER, WDP_CENTER, 230, 120, WC_CUSTOM_CURRENCY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_cust_currency_widgets, lengthof(_nested_cust_currency_widgets) diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 412f43260..d87d03da4 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -201,7 +201,7 @@ static const NWidgetPart _nested_sign_list_widgets[] = { }; static const WindowDesc _sign_list_desc( - WDP_AUTO, WDP_AUTO, 0, 0, 358, 138, + WDP_AUTO, WDP_AUTO, 358, 138, WC_SIGN_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_sign_list_widgets, lengthof(_nested_sign_list_widgets) @@ -399,7 +399,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = { }; static const WindowDesc _query_sign_edit_desc( - 190, 170, 260, 42, 260, 42, + 190, 170, 260, 42, WC_QUERY_STRING, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS, _nested_query_sign_edit_widgets, lengthof(_nested_query_sign_edit_widgets) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 9d39a4d94..a320fe7ed 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1146,7 +1146,7 @@ SmallMapWindow::SmallMapType SmallMapWindow::map_type = SMT_CONTOUR; bool SmallMapWindow::show_towns = true; static const WindowDesc _smallmap_desc( - WDP_AUTO, WDP_AUTO, 350, 214, 446, 314, + WDP_AUTO, WDP_AUTO, 446, 314, WC_SMALLMAP, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_UNCLICK_BUTTONS, _nested_smallmap_widgets, lengthof(_nested_smallmap_widgets) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 2e43f4727..30ebee024 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -675,7 +675,7 @@ static const NWidgetPart _nested_company_stations_widgets[] = { }; static const WindowDesc _company_stations_desc( - WDP_AUTO, WDP_AUTO, 358, 162, 358, 162, + WDP_AUTO, WDP_AUTO, 358, 162, WC_STATION_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_company_stations_widgets, lengthof(_nested_company_stations_widgets) @@ -1122,7 +1122,7 @@ struct StationViewWindow : public Window { static const WindowDesc _station_view_desc( - WDP_AUTO, WDP_AUTO, 249, 110, 249, 110, + WDP_AUTO, WDP_AUTO, 249, 110, WC_STATION_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_station_view_widgets, lengthof(_nested_station_view_widgets) @@ -1370,7 +1370,7 @@ struct SelectStationWindow : Window { }; static const WindowDesc _select_station_desc( - WDP_AUTO, WDP_AUTO, 200, 80, 200, 180, + WDP_AUTO, WDP_AUTO, 200, 180, WC_SELECT_STATION, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_select_station_widgets, lengthof(_nested_select_station_widgets) diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index a582f44b1..524f00417 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -214,7 +214,7 @@ static const NWidgetPart _nested_main_status_widgets[] = { }; static const WindowDesc _main_status_desc( - WDP_CENTER, 0, 320, 12, 640, 12, + WDP_CENTER, 0, 640, 12, WC_STATUS_BAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | 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 da41901e2..9a5007fab 100644 --- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -246,7 +246,7 @@ static const NWidgetPart _nested_subsidies_list_widgets[] = { }; static const WindowDesc _subsidies_list_desc( - WDP_AUTO, WDP_AUTO, 320, 127, 500, 127, + WDP_AUTO, WDP_AUTO, 500, 127, WC_SUBSIDIES_LIST, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_subsidies_list_widgets, lengthof(_nested_subsidies_list_widgets) diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 37827b800..ce6f654ed 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -341,7 +341,7 @@ static const NWidgetPart _nested_terraform_widgets[] = { }; static const WindowDesc _terraform_desc( - WDP_ALIGN_TBR, 22 + 36, 158, 36, 158, 36, + WDP_ALIGN_TBR, 22 + 36, 158, 36, WC_SCEN_LAND_GEN, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_terraform_widgets, lengthof(_nested_terraform_widgets) @@ -774,7 +774,7 @@ struct ScenarioEditorLandscapeGenerationWindow : Window { }; static const WindowDesc _scen_edit_land_gen_desc( - WDP_AUTO, WDP_AUTO, 163, 103, 163, 103, + WDP_AUTO, WDP_AUTO, 163, 103, WC_SCEN_LAND_GEN, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_scen_edit_land_gen_widgets, lengthof(_nested_scen_edit_land_gen_widgets) diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index fff8325b0..8d704c2fe 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -381,7 +381,7 @@ static const NWidgetPart _nested_timetable_widgets[] = { }; static const WindowDesc _timetable_desc( - WDP_AUTO, WDP_AUTO, 400, 130, 400, 130, + WDP_AUTO, WDP_AUTO, 400, 130, WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_timetable_widgets, lengthof(_nested_timetable_widgets) diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 25ff61d82..3ef08a1ab 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1357,7 +1357,7 @@ static const NWidgetPart _nested_toolbar_normal_widgets[] = { }; static const WindowDesc _toolb_normal_desc( - 0, 0, 0, 22, 640, 22, + 0, 0, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_NO_FOCUS, _nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets) @@ -1580,7 +1580,7 @@ static const NWidgetPart _nested_toolb_scen_widgets[] = { }; static const WindowDesc _toolb_scen_desc( - 0, 0, 0, 22, 640, 22, + 0, 0, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | 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 fa36382af..246d468a5 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -267,7 +267,7 @@ public: }; static const WindowDesc _town_authority_desc( - WDP_AUTO, WDP_AUTO, 317, 222, 317, 222, + WDP_AUTO, WDP_AUTO, 317, 222, WC_TOWN_AUTHORITY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _nested_town_authority_widgets, lengthof(_nested_town_authority_widgets) @@ -509,7 +509,7 @@ static const NWidgetPart _nested_town_game_view_widgets[] = { }; static const WindowDesc _town_game_view_desc( - WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, 260, TownViewWindow::TVW_HEIGHT_NORMAL, + WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, WC_TOWN_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, _nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets) @@ -536,7 +536,7 @@ static const NWidgetPart _nested_town_editor_view_widgets[] = { }; static const WindowDesc _town_editor_view_desc( - WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, 260, TownViewWindow::TVW_HEIGHT_NORMAL, + WDP_AUTO, WDP_AUTO, 260, TownViewWindow::TVW_HEIGHT_NORMAL, WC_TOWN_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, _nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets) @@ -826,7 +826,7 @@ GUITownList::SortFunction * const TownDirectoryWindow::sorter_funcs[] = { }; static const WindowDesc _town_directory_desc( - WDP_AUTO, WDP_AUTO, 208, 202, 208, 202, + WDP_AUTO, WDP_AUTO, 208, 202, WC_TOWN_DIRECTORY, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_town_directory_widgets, lengthof(_nested_town_directory_widgets) @@ -1102,7 +1102,7 @@ public: }; static const WindowDesc _found_town_desc( - WDP_AUTO, WDP_AUTO, 160, 162, 160, 162, + WDP_AUTO, WDP_AUTO, 160, 162, WC_FOUND_TOWN, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION, _nested_found_town_widgets, lengthof(_nested_found_town_widgets) diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index ab0d16d0b..203849949 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -153,7 +153,7 @@ static const NWidgetPart _nested_transparency_widgets[] = { }; static const WindowDesc _transparency_desc( - WDP_ALIGN_TBR, 94, 219, 49, 219, 49, + WDP_ALIGN_TBR, 94, 219, 49, WC_TRANSPARENCY_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, _nested_transparency_widgets, lengthof(_nested_transparency_widgets) diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp index 15d1740a0..65ad8ab49 100644 --- a/src/tree_gui.cpp +++ b/src/tree_gui.cpp @@ -228,7 +228,7 @@ static const NWidgetPart _nested_build_trees_widgets[] = { }; static const WindowDesc _build_trees_desc( - WDP_AUTO, WDP_AUTO, 143, 184, 143, 184, + WDP_AUTO, WDP_AUTO, 143, 184, WC_BUILD_TREES, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _nested_build_trees_widgets, lengthof(_nested_build_trees_widgets) diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 9bb6d5fb6..861dd7b68 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -450,7 +450,7 @@ static const NWidgetPart _nested_vehicle_refit_widgets[] = { }; static const WindowDesc _vehicle_refit_desc( - WDP_AUTO, WDP_AUTO, 240, 174, 240, 174, + WDP_AUTO, WDP_AUTO, 240, 174, WC_VEHICLE_REFIT, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE | WDF_CONSTRUCTION, _nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets) @@ -1195,7 +1195,7 @@ public: }; static WindowDesc _vehicle_list_desc( - WDP_AUTO, WDP_AUTO, 260, 194, 260, 246, + WDP_AUTO, WDP_AUTO, 260, 246, WC_INVALID, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_vehicle_list, lengthof(_nested_vehicle_list) @@ -1614,7 +1614,7 @@ struct VehicleDetailsWindow : Window { /** Vehicle details window descriptor. */ static const WindowDesc _train_vehicle_details_desc( - WDP_AUTO, WDP_AUTO, 405, 113, 405, 178, + WDP_AUTO, WDP_AUTO, 405, 178, WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets) @@ -1622,7 +1622,7 @@ static const WindowDesc _train_vehicle_details_desc( /** Vehicle details window descriptor for other vehicles than a train. */ static const WindowDesc _nontrain_vehicle_details_desc( - WDP_AUTO, WDP_AUTO, 405, 113, 405, 113, + WDP_AUTO, WDP_AUTO, 405, 113, WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets) @@ -1679,7 +1679,7 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = { /** Vehicle view window descriptor for all vehicles but trains. */ static const WindowDesc _vehicle_view_desc( - WDP_AUTO, WDP_AUTO, 250, 116, 250, 116, + WDP_AUTO, WDP_AUTO, 250, 116, WC_VEHICLE_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) @@ -1689,7 +1689,7 @@ static const WindowDesc _vehicle_view_desc( * default_height are different for train view. */ static const WindowDesc _train_view_desc( - WDP_AUTO, WDP_AUTO, 250, 134, 250, 134, + WDP_AUTO, WDP_AUTO, 250, 134, WC_VEHICLE_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp index 1ec1af086..79d9e48d3 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -165,7 +165,7 @@ public: }; static const WindowDesc _extra_view_port_desc( - WDP_AUTO, WDP_AUTO, 300, 68, 300, 268, + WDP_AUTO, WDP_AUTO, 300, 268, WC_EXTRA_VIEW_PORT, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, _nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets) diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 9bcb68696..145f51501 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -142,7 +142,7 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = { }; static const WindowDesc _waypoint_view_desc( - WDP_AUTO, WDP_AUTO, 260, 118, 260, 118, + WDP_AUTO, WDP_AUTO, 260, 118, WC_WAYPOINT_VIEW, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON, _nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets) diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 7bda0ec15..5cc41742c 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -83,7 +83,7 @@ static const NWidgetPart _nested_dropdown_menu_widgets[] = { }; const WindowDesc _dropdown_desc( - 0, 0, 0, 0, 0, 0, // x/y position not used. + 0, 0, 0, 0, // x/y position not used. WC_DROPDOWN_MENU, WC_NONE, WDF_DEF_WIDGET, _nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets) diff --git a/src/window.cpp b/src/window.cpp index bca74130b..72e678f93 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -60,21 +60,19 @@ bool _scrolling_viewport; byte _special_mouse_mode; /** Window description constructor. */ -WindowDesc::WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height, int16 def_width, int16 def_height, +WindowDesc::WindowDesc(int16 left, int16 top, int16 def_width, int16 def_height, WindowClass window_class, WindowClass parent_class, uint32 flags, - const NWidgetPart *nwid_parts, int16 nwid_length) -{ - this->left = left; - this->top = top; - this->minimum_width = min_width; - this->minimum_height = min_height; - this->default_width = def_width; - this->default_height = def_height; - this->cls = window_class; - this->parent_cls = parent_class; - this->flags = flags; - this->nwid_parts = nwid_parts; - this->nwid_length = nwid_length; + const NWidgetPart *nwid_parts, int16 nwid_length) : + left(left), + top(top), + default_width(def_width), + default_height(def_height), + cls(window_class), + parent_cls(parent_class), + flags(flags), + nwid_parts(nwid_parts), + nwid_length(nwid_length) +{ } WindowDesc::~WindowDesc() diff --git a/src/window_gui.h b/src/window_gui.h index d9c6c5dce..2ff13c5da 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -126,7 +126,7 @@ extern Window *_focused_window; */ struct WindowDesc : ZeroedMemoryAllocator { - WindowDesc(int16 left, int16 top, int16 min_width, int16 min_height, int16 def_width, int16 def_height, + WindowDesc(int16 left, int16 top, int16 def_width, int16 def_height, WindowClass window_class, WindowClass parent_class, uint32 flags, const NWidgetPart *nwid_parts = NULL, int16 nwid_length = 0); @@ -134,8 +134,6 @@ struct WindowDesc : ZeroedMemoryAllocator { int16 left; ///< Prefered x position of left edge of the window. @see WindowDefaultPosition() int16 top; ///< Prefered y position of the top of the window. @see WindowDefaultPosition() - int16 minimum_width; ///< Minimal width of the window. - int16 minimum_height; ///< Minimal height of the window. int16 default_width; ///< Prefered initial width of the window. int16 default_height; ///< Prefered initial height of the window. WindowClass cls; ///< Class of the window, @see WindowClass. |