diff options
Diffstat (limited to 'src')
43 files changed, 126 insertions, 133 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 24e785984..270e6ed1a 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -234,7 +234,7 @@ static const NWidgetPart _nested_ai_list_widgets[] = { static const WindowDesc _ai_list_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_ai_list_widgets, lengthof(_nested_ai_list_widgets) ); @@ -445,7 +445,7 @@ static const NWidgetPart _nested_ai_settings_widgets[] = { static const WindowDesc _ai_settings_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_ai_settings_widgets, lengthof(_nested_ai_settings_widgets) ); @@ -504,7 +504,7 @@ static const NWidgetPart _nested_ai_config_widgets[] = { static const WindowDesc _ai_config_desc( WDP_CENTER, WDP_CENTER, 300, 172, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_ai_config_widgets, lengthof(_nested_ai_config_widgets) ); @@ -974,7 +974,7 @@ static const NWidgetPart _nested_ai_debug_widgets[] = { static const WindowDesc _ai_debug_desc( 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, + 0, _nested_ai_debug_widgets, lengthof(_nested_ai_debug_widgets) ); diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 983fbae42..37fc2d18e 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -153,7 +153,7 @@ static const NWidgetPart _nested_air_toolbar_widgets[] = { static const WindowDesc _air_toolbar_desc( 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, + WDF_CONSTRUCTION, _nested_air_toolbar_widgets, lengthof(_nested_air_toolbar_widgets) ); @@ -386,7 +386,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = { static const WindowDesc _build_airport_desc( WDP_AUTO, WDP_AUTO, 148, 245, WC_BUILD_STATION, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_airport_widgets, lengthof(_nested_build_airport_widgets) ); diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp index 6dd6ae69a..b014d726d 100644 --- a/src/autoreplace_gui.cpp +++ b/src/autoreplace_gui.cpp @@ -535,7 +535,7 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = { static const WindowDesc _replace_rail_vehicle_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets) ); @@ -566,7 +566,7 @@ static const NWidgetPart _nested_replace_vehicle_widgets[] = { static const WindowDesc _replace_vehicle_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_replace_vehicle_widgets, lengthof(_nested_replace_vehicle_widgets) ); diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index 3a253a593..bca8066ff 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -339,7 +339,7 @@ static const NWidgetPart _nested_build_bridge_widgets[] = { static const WindowDesc _build_bridge_desc( 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, + 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 5d3953247..a740cdc76 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1187,7 +1187,7 @@ struct BuildVehicleWindow : Window { static const WindowDesc _build_vehicle_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_build_vehicle_widgets, lengthof(_nested_build_vehicle_widgets) ); diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index 9b92a381f..183edad11 100644 --- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -320,7 +320,7 @@ struct CheatWindow : Window { static const WindowDesc _cheats_desc( 240, 22, 0, 0, WC_CHEATS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_cheat_widgets, lengthof(_nested_cheat_widgets) ); diff --git a/src/company_gui.cpp b/src/company_gui.cpp index ab0e53f00..53e57d887 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -470,7 +470,7 @@ Money CompanyFinancesWindow::max_money = INT32_MAX; static const WindowDesc _company_finances_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_company_finances_widgets, lengthof(_nested_company_finances_widgets) ); @@ -825,7 +825,7 @@ static const NWidgetPart _nested_select_company_livery_widgets [] = { static const WindowDesc _select_company_livery_desc( WDP_AUTO, WDP_AUTO, 0, 0, WC_COMPANY_COLOUR, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_select_company_livery_widgets, lengthof(_nested_select_company_livery_widgets) ); @@ -1404,7 +1404,7 @@ public: static const WindowDesc _select_company_manager_face_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_select_company_manager_face_widgets, lengthof(_nested_select_company_manager_face_widgets) ); @@ -1412,7 +1412,7 @@ static const WindowDesc _select_company_manager_face_desc( static const WindowDesc _select_company_manager_face_adv_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_select_company_manager_face_adv_widgets, lengthof(_nested_select_company_manager_face_adv_widgets) ); @@ -1900,7 +1900,7 @@ struct CompanyWindow : Window static const WindowDesc _company_desc( WDP_AUTO, WDP_AUTO, 360, 170, WC_COMPANY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_company_widgets, lengthof(_nested_company_widgets) ); @@ -2012,7 +2012,7 @@ static const NWidgetPart _nested_buy_company_widgets[] = { static const WindowDesc _buy_company_desc( 153, 171, 334, 137, WC_BUY_COMPANY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_buy_company_widgets, lengthof(_nested_buy_company_widgets) ); diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index b730a42d6..d9f49d467 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -94,28 +94,28 @@ static const NWidgetPart _nested_train_depot_widgets[] = { static const WindowDesc _train_depot_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _road_depot_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _ship_depot_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); static const WindowDesc _aircraft_depot_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_train_depot_widgets, lengthof(_nested_train_depot_widgets) ); diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index f6ecb1b4c..af72370ba 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -287,7 +287,7 @@ static const NWidgetPart _nested_build_docks_toolbar_widgets[] = { static const WindowDesc _build_docks_toolbar_desc( 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, + WDF_CONSTRUCTION, _nested_build_docks_toolbar_widgets, lengthof(_nested_build_docks_toolbar_widgets) ); @@ -323,7 +323,7 @@ static const NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = { static const WindowDesc _build_docks_scen_toolbar_desc( 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, + WDF_CONSTRUCTION, _nested_build_docks_scen_toolbar_widgets, lengthof(_nested_build_docks_scen_toolbar_widgets) ); @@ -420,7 +420,7 @@ static const NWidgetPart _nested_build_dock_station_widgets[] = { static const WindowDesc _build_dock_station_desc( WDP_AUTO, WDP_AUTO, 148, 75, WC_BUILD_STATION, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_dock_station_widgets, lengthof(_nested_build_dock_station_widgets) ); @@ -506,7 +506,7 @@ static const NWidgetPart _nested_build_docks_depot_widgets[] = { static const WindowDesc _build_docks_depot_desc( WDP_AUTO, WDP_AUTO, 204, 86, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + 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 a165acf64..c7ffc530c 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -126,7 +126,7 @@ struct EnginePreviewWindow : Window { static const WindowDesc _engine_preview_desc( WDP_CENTER, WDP_CENTER, 300, 192, WC_ENGINE_PREVIEW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_engine_preview_widgets, lengthof(_nested_engine_preview_widgets) ); diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 9ef00bfbe..fb581383b 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -769,14 +769,14 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { static const WindowDesc _generate_landscape_desc( WDP_CENTER, WDP_CENTER, 338, 313, WC_GENERATE_LANDSCAPE, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets) ); static const WindowDesc _heightmap_load_desc( WDP_CENTER, WDP_CENTER, 338, 236, WC_GENERATE_LANDSCAPE, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_heightmap_load_widgets, lengthof(_nested_heightmap_load_widgets) ); @@ -1089,7 +1089,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = { static const WindowDesc _create_scenario_desc( WDP_CENTER, WDP_CENTER, 338, 170, WC_GENERATE_LANDSCAPE, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_create_scenario_widgets, lengthof(_nested_create_scenario_widgets) ); @@ -1124,7 +1124,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = { static const WindowDesc _generate_progress_desc( WDP_CENTER, WDP_CENTER, 181, 97, WC_GENERATE_PROGRESS_WINDOW, WC_NONE, - WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + 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 86c8bb73c..bda24d0cd 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -144,7 +144,7 @@ static const NWidgetPart _nested_graph_legend_widgets[] = { static const WindowDesc _graph_legend_desc( WDP_AUTO, WDP_AUTO, 250, 196, WC_GRAPH_LEGEND, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_graph_legend_widgets, lengthof(_nested_graph_legend_widgets) ); @@ -609,7 +609,7 @@ static const NWidgetPart _nested_operating_profit_widgets[] = { static const WindowDesc _operating_profit_desc( WDP_AUTO, WDP_AUTO, 576, 174, WC_OPERATING_PROFIT, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_operating_profit_widgets, lengthof(_nested_operating_profit_widgets) ); @@ -650,7 +650,7 @@ static const NWidgetPart _nested_income_graph_widgets[] = { static const WindowDesc _income_graph_desc( WDP_AUTO, WDP_AUTO, 576, 142, WC_INCOME_GRAPH, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_income_graph_widgets, lengthof(_nested_income_graph_widgets) ); @@ -688,7 +688,7 @@ static const NWidgetPart _nested_delivered_cargo_graph_widgets[] = { static const WindowDesc _delivered_cargo_graph_desc( WDP_AUTO, WDP_AUTO, 576, 142, WC_DELIVERED_CARGO, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_delivered_cargo_graph_widgets, lengthof(_nested_delivered_cargo_graph_widgets) ); @@ -742,7 +742,7 @@ static const NWidgetPart _nested_performance_history_widgets[] = { static const WindowDesc _performance_history_desc( WDP_AUTO, WDP_AUTO, 576, 238, WC_PERFORMANCE_HISTORY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_performance_history_widgets, lengthof(_nested_performance_history_widgets) ); @@ -780,7 +780,7 @@ static const NWidgetPart _nested_company_value_graph_widgets[] = { static const WindowDesc _company_value_graph_desc( WDP_AUTO, WDP_AUTO, 576, 238, WC_COMPANY_VALUE, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_company_value_graph_widgets, lengthof(_nested_company_value_graph_widgets) ); @@ -953,7 +953,7 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = { static const WindowDesc _cargo_payment_rates_desc( WDP_AUTO, WDP_AUTO, 568, 46, WC_PAYMENT_RATES, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets) ); @@ -1136,7 +1136,7 @@ static const NWidgetPart _nested_company_league_widgets[] = { static const WindowDesc _company_league_desc( WDP_AUTO, WDP_AUTO, 400, 167, WC_COMPANY_LEAGUE, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, + 0, _nested_company_league_widgets, lengthof(_nested_company_league_widgets) ); @@ -1478,7 +1478,7 @@ static const NWidgetPart _nested_performance_rating_detail_widgets[] = { static const WindowDesc _performance_rating_detail_desc( WDP_AUTO, WDP_AUTO, 299, 241, WC_PERFORMANCE_DETAIL, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 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 b80553f75..f7f5e62e5 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -689,14 +689,14 @@ public: static WindowDesc _other_group_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_group_widgets, lengthof(_nested_group_widgets) ); const static WindowDesc _train_group_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_group_widgets, lengthof(_nested_group_widgets) ); diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 5e16dfc5e..0b09ad780 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -127,7 +127,7 @@ static const NWidgetPart _nested_build_industry_widgets[] = { static const WindowDesc _build_industry_desc( WDP_AUTO, WDP_AUTO, 170, 212, WC_BUILD_INDUSTRY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_industry_widgets, lengthof(_nested_build_industry_widgets) ); @@ -822,7 +822,7 @@ static const NWidgetPart _nested_industry_view_widgets[] = { static const WindowDesc _industry_view_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_industry_view_widgets, lengthof(_nested_industry_view_widgets) ); @@ -1198,7 +1198,7 @@ const StringID IndustryDirectoryWindow::sorter_names[] = { static const WindowDesc _industry_directory_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_industry_directory_widgets, lengthof(_nested_industry_directory_widgets) ); diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index aac79ce04..a0c5f22d1 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -253,7 +253,7 @@ static const NWidgetPart _nested_select_game_widgets[] = { static const WindowDesc _select_game_desc( WDP_CENTER, WDP_CENTER, 336, 213, WC_SELECT_GAME, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_select_game_widgets, lengthof(_nested_select_game_widgets) ); diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 7cc932db5..8ca259984 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -74,7 +74,7 @@ static const NWidgetPart _nested_land_info_widgets[] = { static const WindowDesc _land_info_desc( WDP_AUTO, WDP_AUTO, 0, 0, WC_LAND_INFO, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_land_info_widgets, lengthof(_nested_land_info_widgets) ); @@ -351,7 +351,7 @@ static const NWidgetPart _nested_about_widgets[] = { static const WindowDesc _about_desc( WDP_CENTER, WDP_CENTER, 0, 0, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_about_widgets, lengthof(_nested_about_widgets) ); @@ -510,7 +510,7 @@ static const NWidgetPart _nested_errmsg_widgets[] = { static const WindowDesc _errmsg_desc( 0, 0, 240, 46, // x/y position is not used. WC_ERRMSG, WC_NONE, - WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_errmsg_widgets, lengthof(_nested_errmsg_widgets) ); @@ -530,7 +530,7 @@ static const NWidgetPart _nested_errmsg_face_widgets[] = { static const WindowDesc _errmsg_face_desc( 0, 0, 334, 137, // x/y position is not used. WC_ERRMSG, WC_NONE, - WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets) ); @@ -1443,7 +1443,7 @@ static const NWidgetPart _nested_query_string_widgets[] = { static const WindowDesc _query_string_desc( 190, 219, 260, 42, WC_QUERY_STRING, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + 0, _nested_query_string_widgets, lengthof(_nested_query_string_widgets) ); @@ -1598,7 +1598,7 @@ static const NWidgetPart _nested_query_widgets[] = { static const WindowDesc _query_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_MODAL, _nested_query_widgets, lengthof(_nested_query_widgets) ); @@ -2041,14 +2041,14 @@ public: static const WindowDesc _load_dialog_desc( WDP_CENTER, WDP_CENTER, 257, 294, WC_SAVELOAD, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets) ); static const WindowDesc _save_dialog_desc( WDP_CENTER, WDP_CENTER, 257, 320, WC_SAVELOAD, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets) ); diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 218007a4e..6052c844b 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -415,7 +415,7 @@ static const NWidgetPart _nested_music_track_selection_widgets[] = { static const WindowDesc _music_track_selection_desc( 104, 131, 432, 218, WC_MUSIC_TRACK_SELECTION, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets) ); @@ -721,7 +721,7 @@ static const NWidgetPart _nested_music_window_widgets[] = { static const WindowDesc _music_window_desc( 0, 22, 300, 66, WC_MUSIC_WINDOW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + 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 0368a94d2..d66211f95 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -545,7 +545,7 @@ static const NWidgetPart _nested_chat_window_widgets[] = { static const WindowDesc _chat_window_desc( WDP_CENTER, 0, 640, 14, // x, y, width, height WC_SEND_NETWORK_MSG, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET, + 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 1fefe925d..4b5d6a296 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -49,7 +49,7 @@ static const NWidgetPart _nested_network_content_download_status_window_widgets[ static const WindowDesc _network_content_download_status_window_desc( WDP_CENTER, WDP_CENTER, 350, 85, WC_NETWORK_STATUS_WINDOW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL, + WDF_MODAL, _nested_network_content_download_status_window_widgets, lengthof(_nested_network_content_download_status_window_widgets) ); @@ -871,7 +871,7 @@ static const NWidgetPart _nested_network_content_list_widgets[] = { static const WindowDesc _network_content_list_desc( 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, + WDF_UNCLICK_BUTTONS, _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 c3e8517e5..50b43e354 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1006,7 +1006,7 @@ static const NWidgetPart _nested_network_game_widgets[] = { static const WindowDesc _network_game_window_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_network_game_widgets, lengthof(_nested_network_game_widgets) ); @@ -1434,7 +1434,7 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = { static const WindowDesc _network_start_server_window_desc( WDP_CENTER, WDP_CENTER, 420, 244, WC_NETWORK_WINDOW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets) ); @@ -1734,7 +1734,7 @@ static const NWidgetPart _nested_network_lobby_window_widgets[] = { static const WindowDesc _network_lobby_window_desc( WDP_CENTER, WDP_CENTER, 0, 0, WC_NETWORK_WINDOW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_network_lobby_window_widgets, lengthof(_nested_network_lobby_window_widgets) ); @@ -1777,7 +1777,7 @@ static const NWidgetPart _nested_client_list_popup_widgets[] = { static const WindowDesc _client_list_popup_desc( WDP_AUTO, WDP_AUTO, 150, 1, WC_TOOLBAR_MENU, WC_CLIENT_LIST, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET, + 0, _nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets) ); @@ -1993,7 +1993,7 @@ static const NWidgetPart _nested_client_list_widgets[] = { static const WindowDesc _client_list_desc( 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, + 0, _nested_client_list_widgets, lengthof(_nested_client_list_widgets) ); @@ -2275,7 +2275,7 @@ static const NWidgetPart _nested_network_join_status_window_widgets[] = { static const WindowDesc _network_join_status_window_desc( WDP_CENTER, WDP_CENTER, 250, 85, WC_NETWORK_STATUS_WINDOW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL, + WDF_MODAL, _nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets) ); @@ -2400,7 +2400,7 @@ static const NWidgetPart _nested_network_company_password_window_widgets[] = { static const WindowDesc _network_company_password_window_desc( 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, + WDF_UNCLICK_BUTTONS, _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 2263fd058..bab8e11e4 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -489,7 +489,7 @@ static const NWidgetPart _nested_newgrf_add_dlg_widgets[] = { static const WindowDesc _newgrf_add_dlg_desc( WDP_CENTER, WDP_CENTER, 306, 347, WC_SAVELOAD, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_newgrf_add_dlg_widgets, lengthof(_nested_newgrf_add_dlg_widgets) ); @@ -1051,7 +1051,7 @@ static const NWidgetPart _nested_newgrf_widgets[] = { static const WindowDesc _newgrf_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_newgrf_widgets, lengthof(_nested_newgrf_widgets) ); diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 6a80cdec4..268ed0572 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -108,7 +108,7 @@ static const NWidgetPart _nested_normal_news_widgets[] = { static WindowDesc _normal_news_desc( WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_normal_news_widgets, lengthof(_nested_normal_news_widgets) ); @@ -135,7 +135,7 @@ static const NWidgetPart _nested_vehicle_news_widgets[] = { static WindowDesc _vehicle_news_desc( WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_vehicle_news_widgets, lengthof(_nested_vehicle_news_widgets) ); @@ -166,7 +166,7 @@ static const NWidgetPart _nested_company_news_widgets[] = { static WindowDesc _company_news_desc( WDP_CENTER, 476, 430, 170, WC_NEWS_WINDOW, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_company_news_widgets, lengthof(_nested_company_news_widgets) ); @@ -189,7 +189,7 @@ static const NWidgetPart _nested_thin_news_widgets[] = { static WindowDesc _thin_news_desc( WDP_CENTER, 476, 430, 130, WC_NEWS_WINDOW, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_thin_news_widgets, lengthof(_nested_thin_news_widgets) ); @@ -213,7 +213,7 @@ static NWidgetPart _nested_small_news_widgets[] = { static WindowDesc _small_news_desc( WDP_CENTER, 476, 280, 87, WC_NEWS_WINDOW, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_small_news_widgets, lengthof(_nested_small_news_widgets) ); @@ -1031,7 +1031,7 @@ static const NWidgetPart _nested_message_history[] = { static const WindowDesc _message_history_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_message_history, lengthof(_nested_message_history) ); @@ -1319,7 +1319,7 @@ static const NWidgetPart _nested_message_options_widgets[] = { static const WindowDesc _message_options_desc( 270, 22, 0, 0, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + 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 e1068f8bf..ef75ecd75 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -1341,7 +1341,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = { static const WindowDesc _orders_train_desc( 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, + 0, _nested_orders_train_widgets, lengthof(_nested_orders_train_widgets) ); @@ -1405,7 +1405,7 @@ static const NWidgetPart _nested_orders_widgets[] = { static const WindowDesc _orders_desc( 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, + 0, _nested_orders_widgets, lengthof(_nested_orders_widgets) ); @@ -1431,7 +1431,7 @@ static const NWidgetPart _nested_other_orders_widgets[] = { static const WindowDesc _other_orders_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_other_orders_widgets, lengthof(_nested_other_orders_widgets) ); diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 02d626846..08e6aefa9 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -388,7 +388,7 @@ static const NWidgetPart _nested_osk_widgets[] = { static const WindowDesc _osk_desc( WDP_CENTER, WDP_CENTER, 256, 140, WC_OSK, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_osk_widgets, lengthof(_nested_osk_widgets) ); diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 100d16eda..51f655421 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -861,7 +861,7 @@ static const NWidgetPart _nested_build_rail_widgets[] = { static const WindowDesc _build_rail_desc( 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, + WDF_CONSTRUCTION, _nested_build_rail_widgets, lengthof(_nested_build_rail_widgets) ); @@ -1471,7 +1471,7 @@ static const NWidgetPart _nested_newstation_builder_widgets[] = { static const WindowDesc _station_builder_desc( WDP_AUTO, WDP_AUTO, 148, 200, WC_BUILD_STATION, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_station_builder_widgets, lengthof(_nested_station_builder_widgets) ); @@ -1479,7 +1479,7 @@ static const WindowDesc _station_builder_desc( static const WindowDesc _newstation_builder_desc( WDP_AUTO, WDP_AUTO, 148, 290, WC_BUILD_STATION, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_newstation_builder_widgets, lengthof(_nested_newstation_builder_widgets) ); @@ -1686,7 +1686,7 @@ static const NWidgetPart _nested_signal_builder_widgets[] = { static const WindowDesc _signal_builder_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_signal_builder_widgets, lengthof(_nested_signal_builder_widgets) ); @@ -1779,7 +1779,7 @@ static const NWidgetPart _nested_build_depot_widgets[] = { static const WindowDesc _build_depot_desc( WDP_AUTO, WDP_AUTO, 140, 122, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_depot_widgets, lengthof(_nested_build_depot_widgets) ); @@ -1882,7 +1882,7 @@ static const NWidgetPart _nested_build_waypoint_widgets[] = { static const WindowDesc _build_waypoint_desc( WDP_AUTO, WDP_AUTO, 344, 92, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_waypoint_widgets, lengthof(_nested_build_waypoint_widgets) ); diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 462fa24fe..060b6c0b6 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -666,7 +666,7 @@ static const NWidgetPart _nested_build_road_widgets[] = { static const WindowDesc _build_road_desc( 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, + WDF_CONSTRUCTION, _nested_build_road_widgets, lengthof(_nested_build_road_widgets) ); @@ -705,7 +705,7 @@ static const NWidgetPart _nested_build_tramway_widgets[] = { static const WindowDesc _build_tramway_desc( 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, + WDF_CONSTRUCTION, _nested_build_tramway_widgets, lengthof(_nested_build_tramway_widgets) ); @@ -748,7 +748,7 @@ static const NWidgetPart _nested_build_road_scen_widgets[] = { static const WindowDesc _build_road_scen_desc( 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, + WDF_CONSTRUCTION, _nested_build_road_scen_widgets, lengthof(_nested_build_road_scen_widgets) ); @@ -848,7 +848,7 @@ static const NWidgetPart _nested_build_road_depot_widgets[] = { static const WindowDesc _build_road_depot_desc( WDP_AUTO, WDP_AUTO, 140, 122, WC_BUILD_DEPOT, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_road_depot_widgets, lengthof(_nested_build_road_depot_widgets) ); @@ -1018,7 +1018,7 @@ static const NWidgetPart _nested_rv_station_picker_widgets[] = { static const WindowDesc _rv_station_picker_desc( WDP_AUTO, WDP_AUTO, 207, 178, WC_BUS_STATION, WC_BUILD_TOOLBAR, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + 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 f359b8f6c..c67526d13 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -491,7 +491,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { static const WindowDesc _game_options_desc( WDP_CENTER, WDP_CENTER, 370, 249, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_game_options_widgets, lengthof(_nested_game_options_widgets) ); @@ -769,7 +769,7 @@ static const NWidgetPart _nested_game_difficulty_widgets[] = { static const WindowDesc _game_difficulty_desc( WDP_CENTER, WDP_CENTER, 370, 279, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + WDF_UNCLICK_BUTTONS, _nested_game_difficulty_widgets, lengthof(_nested_game_difficulty_widgets) ); @@ -1664,7 +1664,7 @@ static const NWidgetPart _nested_settings_selection_widgets[] = { static const WindowDesc _settings_selection_desc( WDP_CENTER, WDP_CENTER, 450, 397, WC_GAME_OPTIONS, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE, + 0, _nested_settings_selection_widgets, lengthof(_nested_settings_selection_widgets) ); @@ -1947,7 +1947,7 @@ static const NWidgetPart _nested_cust_currency_widgets[] = { static const WindowDesc _cust_currency_desc( WDP_CENTER, WDP_CENTER, 230, 120, WC_CUSTOM_CURRENCY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, + 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 03391a9ec..a2a85416d 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -218,7 +218,7 @@ static const NWidgetPart _nested_sign_list_widgets[] = { static const WindowDesc _sign_list_desc( 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, + 0, _nested_sign_list_widgets, lengthof(_nested_sign_list_widgets) ); @@ -416,7 +416,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = { static const WindowDesc _query_sign_edit_desc( 190, 170, 260, 42, WC_QUERY_STRING, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION | WDF_UNCLICK_BUTTONS, + 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 813e82dd7..16b8c190c 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1151,7 +1151,7 @@ bool SmallMapWindow::show_towns = true; static const WindowDesc _smallmap_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_smallmap_widgets, lengthof(_nested_smallmap_widgets) ); diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 4cc49e22c..121d2031e 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -715,7 +715,7 @@ static const NWidgetPart _nested_company_stations_widgets[] = { static const WindowDesc _company_stations_desc( 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, + 0, _nested_company_stations_widgets, lengthof(_nested_company_stations_widgets) ); @@ -1173,7 +1173,7 @@ struct StationViewWindow : public Window { static const WindowDesc _station_view_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_station_view_widgets, lengthof(_nested_station_view_widgets) ); @@ -1422,7 +1422,7 @@ struct SelectStationWindow : Window { static const WindowDesc _select_station_desc( WDP_AUTO, WDP_AUTO, 200, 180, WC_SELECT_STATION, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_select_station_widgets, lengthof(_nested_select_station_widgets) ); diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index fb3b22308..a4a3661d5 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -237,7 +237,7 @@ static const NWidgetPart _nested_main_status_widgets[] = { static const WindowDesc _main_status_desc( WDP_CENTER, 0, 640, 12, WC_STATUS_BAR, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS, + 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 4d6e17530..acec347ab 100644 --- a/src/subsidy_gui.cpp +++ b/src/subsidy_gui.cpp @@ -248,7 +248,7 @@ static const NWidgetPart _nested_subsidies_list_widgets[] = { static const WindowDesc _subsidies_list_desc( 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, + 0, _nested_subsidies_list_widgets, lengthof(_nested_subsidies_list_widgets) ); diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 132146f54..9b977954c 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -343,7 +343,7 @@ static const NWidgetPart _nested_terraform_widgets[] = { static const WindowDesc _terraform_desc( 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, + WDF_CONSTRUCTION, _nested_terraform_widgets, lengthof(_nested_terraform_widgets) ); @@ -776,7 +776,7 @@ struct ScenarioEditorLandscapeGenerationWindow : Window { static const WindowDesc _scen_edit_land_gen_desc( 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, + 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 dfb722d76..8b4ec2334 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -382,7 +382,7 @@ static const NWidgetPart _nested_timetable_widgets[] = { static const WindowDesc _timetable_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_timetable_widgets, lengthof(_nested_timetable_widgets) ); diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index d0cca882f..369a532e0 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1360,7 +1360,7 @@ static const NWidgetPart _nested_toolbar_normal_widgets[] = { static const WindowDesc _toolb_normal_desc( 0, 0, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_NO_FOCUS, + WDF_NO_FOCUS, _nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets) ); @@ -1583,7 +1583,7 @@ static const NWidgetPart _nested_toolb_scen_widgets[] = { static const WindowDesc _toolb_scen_desc( 0, 0, 640, 22, WC_MAIN_TOOLBAR, WC_NONE, - WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_NO_FOCUS, + 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 237485266..9cf0c9193 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -286,7 +286,7 @@ public: static const WindowDesc _town_authority_desc( WDP_AUTO, WDP_AUTO, 317, 222, WC_TOWN_AUTHORITY, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_town_authority_widgets, lengthof(_nested_town_authority_widgets) ); @@ -549,7 +549,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, WC_TOWN_VIEW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_town_game_view_widgets, lengthof(_nested_town_game_view_widgets) ); @@ -579,7 +579,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, WC_TOWN_VIEW, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, + WDF_UNCLICK_BUTTONS, _nested_town_editor_view_widgets, lengthof(_nested_town_editor_view_widgets) ); @@ -869,7 +869,7 @@ GUITownList::SortFunction * const TownDirectoryWindow::sorter_funcs[] = { static const WindowDesc _town_directory_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_town_directory_widgets, lengthof(_nested_town_directory_widgets) ); @@ -1145,7 +1145,7 @@ public: static const WindowDesc _found_town_desc( 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, + WDF_CONSTRUCTION, _nested_found_town_widgets, lengthof(_nested_found_town_widgets) ); diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index 73d150b85..1202cbc20 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -155,7 +155,7 @@ static const NWidgetPart _nested_transparency_widgets[] = { static const WindowDesc _transparency_desc( WDP_ALIGN_TBR, 94, 219, 49, WC_TRANSPARENCY_TOOLBAR, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, + 0, _nested_transparency_widgets, lengthof(_nested_transparency_widgets) ); diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp index 04a07566d..c93b44144 100644 --- a/src/tree_gui.cpp +++ b/src/tree_gui.cpp @@ -230,7 +230,7 @@ static const NWidgetPart _nested_build_trees_widgets[] = { static const WindowDesc _build_trees_desc( WDP_AUTO, WDP_AUTO, 143, 184, WC_BUILD_TREES, WC_NONE, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, + WDF_CONSTRUCTION, _nested_build_trees_widgets, lengthof(_nested_build_trees_widgets) ); diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 95a157429..9482f6428 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -449,7 +449,7 @@ static const NWidgetPart _nested_vehicle_refit_widgets[] = { static const WindowDesc _vehicle_refit_desc( 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, + WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION, _nested_vehicle_refit_widgets, lengthof(_nested_vehicle_refit_widgets) ); @@ -1194,7 +1194,7 @@ public: static WindowDesc _vehicle_list_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_vehicle_list, lengthof(_nested_vehicle_list) ); @@ -1608,7 +1608,7 @@ struct VehicleDetailsWindow : Window { static const WindowDesc _train_vehicle_details_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_train_vehicle_details_widgets, lengthof(_nested_train_vehicle_details_widgets) ); @@ -1616,7 +1616,7 @@ static const WindowDesc _train_vehicle_details_desc( static const WindowDesc _nontrain_vehicle_details_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_nontrain_vehicle_details_widgets, lengthof(_nested_nontrain_vehicle_details_widgets) ); @@ -1673,7 +1673,7 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = { static const WindowDesc _vehicle_view_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) ); @@ -1683,7 +1683,7 @@ static const WindowDesc _vehicle_view_desc( static const WindowDesc _train_view_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_vehicle_view_widgets, lengthof(_nested_vehicle_view_widgets) ); diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp index 7db7a7b3c..152af06f8 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -167,7 +167,7 @@ public: static const WindowDesc _extra_view_port_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_extra_view_port_widgets, lengthof(_nested_extra_view_port_widgets) ); diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 8a43c6799..c25759aa0 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -144,7 +144,7 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = { static const WindowDesc _waypoint_view_desc( 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, + WDF_UNCLICK_BUTTONS, _nested_waypoint_view_widgets, lengthof(_nested_waypoint_view_widgets) ); diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index d8f489fc4..f2a7b80dd 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -85,7 +85,7 @@ static const NWidgetPart _nested_dropdown_menu_widgets[] = { const WindowDesc _dropdown_desc( 0, 0, 0, 0, // x/y position not used. WC_DROPDOWN_MENU, WC_NONE, - WDF_DEF_WIDGET, + 0, _nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets) ); diff --git a/src/window_gui.h b/src/window_gui.h index a920ac648..a65246567 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -149,17 +149,10 @@ struct WindowDesc : ZeroedMemoryAllocator { * Window default widget/window handling flags */ enum WindowDefaultFlag { - WDF_STD_TOOLTIPS = 1 << 0, ///< use standard routine when displaying tooltips - WDF_DEF_WIDGET = 1 << 1, ///< Default widget control for some widgets in the on click event, @see DispatchLeftClickEvent() - WDF_STD_BTN = 1 << 2, ///< Default handling for close and titlebar widgets (the widgets with type WWT_CLOSEBOX and WWT_CAPTION). - WDF_CONSTRUCTION = 1 << 3, ///< This window is used for construction; close it whenever changing company. - - WDF_UNCLICK_BUTTONS = 1 << 4, ///< Unclick buttons when the window event times out - WDF_STICKY_BUTTON = 1 << 5, ///< Set window to sticky mode; they are not closed unless closed with 'X' (widget with type WWT_STICKYBOX). - WDF_RESIZABLE = 1 << 6, ///< Window can be resized - WDF_MODAL = 1 << 7, ///< The window is a modal child of some other window, meaning the parent is 'inactive' - - WDF_NO_FOCUS = 1 << 8, ///< This window won't get focus/make any other window lose focus when click + WDF_CONSTRUCTION = 1 << 0, ///< This window is used for construction; close it whenever changing company. + WDF_UNCLICK_BUTTONS = 1 << 1, ///< Unclick buttons when the window event times out + WDF_MODAL = 1 << 2, ///< The window is a modal child of some other window, meaning the parent is 'inactive' + WDF_NO_FOCUS = 1 << 3, ///< This window won't get focus/make any other window lose focus when click }; /** |