(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
--- a/aircraft_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/aircraft_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -167,7 +167,7 @@
};
static const WindowDesc _aircraft_details_desc = {
- -1, -1, 390, 114,
+ WDP_AUTO, WDP_AUTO, 390, 114,
WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_aircraft_details_widgets,
@@ -331,7 +331,7 @@
static const WindowDesc _aircraft_view_desc = {
- -1,-1, 250, 116,
+ WDP_AUTO, WDP_AUTO, 250, 116,
WC_VEHICLE_VIEW ,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_aircraft_view_widgets,
--- a/airport_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/airport_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -124,8 +124,8 @@
static const WindowDesc _air_toolbar_desc = {
- 640-86, 22, 86, 36,
- WC_BUILD_TOOLBAR,0,
+ 0, 22, 86, 36,
+ WC_BUILD_TOOLBAR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_air_toolbar_widgets,
BuildAirToolbWndProc
@@ -262,8 +262,8 @@
};
static const WindowDesc _build_airport_desc = {
- -1, -1, 148, 240,
- WC_BUILD_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 148, 240,
+ WC_BUILD_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_airport_picker_widgets,
BuildAirportPickerWndProc
--- a/bridge_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/bridge_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -87,8 +87,8 @@
};
static const WindowDesc _build_bridge_desc = {
- -1, -1, 200, 102,
- WC_BUILD_BRIDGE,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 200, 102,
+ WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_bridge_widgets,
BuildBridgeWndProc
@@ -104,8 +104,8 @@
};
static const WindowDesc _build_road_bridge_desc = {
- -1, -1, 200, 102,
- WC_BUILD_BRIDGE,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 200, 102,
+ WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_road_bridge_widgets,
BuildBridgeWndProc
--- a/build_vehicle_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/build_vehicle_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -540,7 +540,7 @@
}
static const WindowDesc _build_vehicle_desc = {
- -1, -1, 240, 238,
+ WDP_AUTO, WDP_AUTO, 240, 238,
WC_BUILD_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_build_vehicle_widgets,
--- a/depot_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/depot_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -110,7 +110,7 @@
static void DepotWndProc(Window *w, WindowEvent *e);
static const WindowDesc _train_depot_desc = {
- -1, -1, 361, 122,
+ WDP_AUTO, WDP_AUTO, 361, 122,
WC_VEHICLE_DEPOT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_depot_widgets,
@@ -118,7 +118,7 @@
};
static const WindowDesc _road_depot_desc = {
- -1, -1, 315, 96,
+ WDP_AUTO, WDP_AUTO, 315, 96,
WC_VEHICLE_DEPOT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_depot_widgets,
@@ -126,7 +126,7 @@
};
static const WindowDesc _ship_depot_desc = {
- -1, -1, 305, 98,
+ WDP_AUTO, WDP_AUTO, 305, 98,
WC_VEHICLE_DEPOT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_depot_widgets,
@@ -134,7 +134,7 @@
};
static const WindowDesc _aircraft_depot_desc = {
- -1, -1, 331, 98,
+ WDP_AUTO, WDP_AUTO, 331, 98,
WC_VEHICLE_DEPOT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_depot_widgets,
--- a/dock_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/dock_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -205,8 +205,8 @@
};
static const WindowDesc _build_docks_toolbar_desc = {
- 640-158, 22, 158, 36,
- WC_BUILD_TOOLBAR,0,
+ 0, 22, 158, 36,
+ WC_BUILD_TOOLBAR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_build_docks_toolb_widgets,
BuildDocksToolbWndProc
@@ -279,8 +279,8 @@
};
static const WindowDesc _build_dock_station_desc = {
- -1, -1, 148, 75,
- WC_BUILD_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 148, 75,
+ WC_BUILD_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_dock_station_widgets,
BuildDockStationWndProc
@@ -348,8 +348,8 @@
};
static const WindowDesc _build_docks_depot_desc = {
- -1, -1, 204, 86,
- WC_BUILD_DEPOT,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 204, 86,
+ WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_docks_depot_widgets,
BuildDocksDepotWndProc
--- a/graph_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/graph_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -283,7 +283,7 @@
};
static const WindowDesc _graph_legend_desc = {
- -1, -1, 250, 114,
+ WDP_AUTO, WDP_AUTO, 250, 114,
WC_GRAPH_LEGEND,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_graph_legend_widgets,
@@ -384,7 +384,7 @@
};
static const WindowDesc _operating_profit_desc = {
- -1, -1, 576, 174,
+ WDP_AUTO, WDP_AUTO, 576, 174,
WC_OPERATING_PROFIT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_operating_profit_widgets,
@@ -459,7 +459,7 @@
};
static const WindowDesc _income_graph_desc = {
- -1, -1, 576, 142,
+ WDP_AUTO, WDP_AUTO, 576, 142,
WC_INCOME_GRAPH,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_income_graph_widgets,
@@ -532,7 +532,7 @@
};
static const WindowDesc _delivered_cargo_graph_desc = {
- -1, -1, 576, 142,
+ WDP_AUTO, WDP_AUTO, 576, 142,
WC_DELIVERED_CARGO,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_delivered_cargo_graph_widgets,
@@ -608,7 +608,7 @@
};
static const WindowDesc _performance_history_desc = {
- -1, -1, 576, 238,
+ WDP_AUTO, WDP_AUTO, 576, 238,
WC_PERFORMANCE_HISTORY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_performance_history_widgets,
@@ -681,7 +681,7 @@
};
static const WindowDesc _company_value_graph_desc = {
- -1, -1, 576, 238,
+ WDP_AUTO, WDP_AUTO, 576, 238,
WC_COMPANY_VALUE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_company_value_graph_widgets,
@@ -796,7 +796,7 @@
};
static const WindowDesc _cargo_payment_rates_desc = {
- -1, -1, 568, 142,
+ WDP_AUTO, WDP_AUTO, 568, 142,
WC_PAYMENT_RATES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_cargo_payment_rates_widgets,
@@ -888,7 +888,7 @@
};
static const WindowDesc _company_league_desc = {
- -1, -1, 400, 97,
+ WDP_AUTO, WDP_AUTO, 400, 97,
WC_COMPANY_LEAGUE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_company_league_widgets,
@@ -1110,7 +1110,7 @@
};
static const WindowDesc _performance_rating_detail_desc = {
- -1, -1, 299, 228,
+ WDP_AUTO, WDP_AUTO, 299, 228,
WC_PERFORMANCE_DETAIL,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_performance_rating_detail_widgets,
@@ -1239,7 +1239,7 @@
};
static const WindowDesc _sign_list_desc = {
- -1, -1, 358, 138,
+ WDP_AUTO, WDP_AUTO, 358, 138,
WC_SIGN_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_sign_list_widget,
--- a/industry_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/industry_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -188,7 +188,7 @@
static const WindowDesc _build_industry_land0_desc = {
- -1, -1, 170, 116,
+ WDP_AUTO, WDP_AUTO, 170, 116,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land0_widgets,
@@ -196,7 +196,7 @@
};
static const WindowDesc _build_industry_land1_desc = {
- -1, -1, 170, 116,
+ WDP_AUTO, WDP_AUTO, 170, 116,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land1_widgets,
@@ -204,7 +204,7 @@
};
static const WindowDesc _build_industry_land2_desc = {
- -1, -1, 170, 116,
+ WDP_AUTO, WDP_AUTO, 170, 116,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land2_widgets,
@@ -212,7 +212,7 @@
};
static const WindowDesc _build_industry_land3_desc = {
- -1, -1, 170, 116,
+ WDP_AUTO, WDP_AUTO, 170, 116,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land3_widgets,
@@ -220,7 +220,7 @@
};
static const WindowDesc _build_industry_land0_desc_extra = {
- -1, -1, 170, 188,
+ WDP_AUTO, WDP_AUTO, 170, 188,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land0_widgets_extra,
@@ -228,7 +228,7 @@
};
static const WindowDesc _build_industry_land1_desc_extra = {
- -1, -1, 170, 175,
+ WDP_AUTO, WDP_AUTO, 170, 175,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land1_widgets_extra,
@@ -236,7 +236,7 @@
};
static const WindowDesc _build_industry_land2_desc_extra = {
- -1, -1, 170, 201,
+ WDP_AUTO, WDP_AUTO, 170, 201,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land2_widgets_extra,
@@ -244,7 +244,7 @@
};
static const WindowDesc _build_industry_land3_desc_extra = {
- -1, -1, 170, 188,
+ WDP_AUTO, WDP_AUTO, 170, 188,
WC_BUILD_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_industry_land3_widgets_extra,
@@ -434,7 +434,7 @@
};
static const WindowDesc _industry_view_desc = {
- -1, -1, 260, 160,
+ WDP_AUTO, WDP_AUTO, 260, 160,
WC_INDUSTRY_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_industry_view_widgets,
@@ -676,7 +676,7 @@
/* Industry List */
static const WindowDesc _industry_directory_desc = {
- -1, -1, 508, 190,
+ WDP_AUTO, WDP_AUTO, 508, 190,
WC_INDUSTRY_DIRECTORY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_industry_directory_widgets,
--- a/main_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/main_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -1331,7 +1331,7 @@
}
static const WindowDesc _scen_edit_land_gen_desc = {
- -1,-1, 182, 96,
+ WDP_AUTO, WDP_AUTO, 182, 96,
WC_SCEN_LAND_GEN,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_scen_edit_land_gen_widgets,
@@ -1447,7 +1447,7 @@
}
static const WindowDesc _scen_edit_town_gen_desc = {
- -1,-1, 160, 82,
+ WDP_AUTO, WDP_AUTO, 160, 82,
WC_SCEN_TOWN_GEN,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_scen_edit_town_gen_widgets,
@@ -1659,7 +1659,7 @@
}
static const WindowDesc _scenedit_industry_normal_desc = {
- -1,-1, 170, 225,
+ WDP_AUTO, WDP_AUTO, 170, 225,
WC_SCEN_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_scenedit_industry_normal_widgets,
@@ -1667,7 +1667,7 @@
};
static const WindowDesc _scenedit_industry_hilly_desc = {
- -1,-1, 170, 225,
+ WDP_AUTO, WDP_AUTO, 170, 225,
WC_SCEN_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_scenedit_industry_hilly_widgets,
@@ -1675,7 +1675,7 @@
};
static const WindowDesc _scenedit_industry_desert_desc = {
- -1,-1, 170, 225,
+ WDP_AUTO, WDP_AUTO, 170, 225,
WC_SCEN_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_scenedit_industry_desert_widgets,
@@ -1683,7 +1683,7 @@
};
static const WindowDesc _scenedit_industry_candy_desc = {
- -1,-1, 170, 225,
+ WDP_AUTO, WDP_AUTO, 170, 225,
WC_SCEN_INDUSTRY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_scenedit_industry_candy_widgets,
--- a/misc_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/misc_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -133,7 +133,7 @@
};
static const WindowDesc _land_info_desc = {
- -1, -1, 280, 93,
+ WDP_AUTO, WDP_AUTO, 280, 93,
WC_LAND_INFO,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_land_info_widgets,
@@ -440,7 +440,7 @@
};
static const WindowDesc _build_trees_scen_desc = {
- -1, -1, 143, 184,
+ WDP_AUTO, WDP_AUTO, 143, 184,
WC_BUILD_TREES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_trees_scen_widgets,
--- a/network_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/network_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -1028,7 +1028,7 @@
};
static WindowDesc _client_list_desc = {
- -1, -1, 250, 1,
+ WDP_AUTO, WDP_AUTO, 250, 1,
WC_CLIENT_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_client_list_widgets,
--- a/order_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/order_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -583,7 +583,7 @@
};
static const WindowDesc _orders_train_desc = {
- -1,-1, 399, 88,
+ WDP_AUTO, WDP_AUTO, 399, 88,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
_orders_train_widgets,
@@ -610,7 +610,7 @@
};
static const WindowDesc _orders_desc = {
- -1,-1, 410, 88,
+ WDP_AUTO, WDP_AUTO, 410, 88,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
_orders_widgets,
@@ -634,7 +634,7 @@
};
static const WindowDesc _other_orders_desc = {
- -1,-1, 332, 88,
+ WDP_AUTO, WDP_AUTO, 332, 88,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_other_orders_widgets,
--- a/player_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/player_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -188,7 +188,7 @@
}
static const WindowDesc _player_finances_desc = {
- -1,-1, 407, 216,
+ WDP_AUTO, WDP_AUTO, 407, 216,
WC_FINANCES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_player_finances_widgets,
@@ -196,7 +196,7 @@
};
static const WindowDesc _player_finances_small_desc = {
- -1,-1, 280, 60,
+ WDP_AUTO, WDP_AUTO, 280, 60,
WC_FINANCES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_player_finances_small_widgets,
@@ -204,7 +204,7 @@
};
static const WindowDesc _other_player_finances_desc = {
- -1,-1, 407, 204,
+ WDP_AUTO, WDP_AUTO, 407, 204,
WC_FINANCES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_other_player_finances_widgets,
@@ -212,7 +212,7 @@
};
static const WindowDesc _other_player_finances_small_desc = {
- -1,-1, 280, 48,
+ WDP_AUTO, WDP_AUTO, 280, 48,
WC_FINANCES,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_other_player_finances_small_widgets,
@@ -470,7 +470,7 @@
};
static const WindowDesc _select_player_livery_2cc_desc = {
- -1,-1, 400, 49 + 1 * 14,
+ WDP_AUTO, WDP_AUTO, 400, 49 + 1 * 14,
WC_PLAYER_COLOR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_select_player_livery_2cc_widgets,
@@ -497,7 +497,7 @@
};
static const WindowDesc _select_player_livery_desc = {
- -1, -1, 275, 49 + 1 * 14,
+ WDP_AUTO, WDP_AUTO, 275, 49 + 1 * 14,
WC_PLAYER_COLOR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_select_player_livery_widgets,
@@ -551,7 +551,7 @@
};
static const WindowDesc _select_player_face_desc = {
- -1,-1, 190, 149,
+ WDP_AUTO, WDP_AUTO, 190, 149,
WC_PLAYER_FACE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_select_player_face_widgets,
@@ -867,7 +867,7 @@
static const WindowDesc _player_company_desc = {
- -1, -1, 360, 170,
+ WDP_AUTO, WDP_AUTO, 360, 170,
WC_COMPANY, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_player_company_widgets,
@@ -928,7 +928,7 @@
};
static const WindowDesc _buy_company_desc = {
- 153,171, 334, 137,
+ 153, 171, 334, 137,
WC_BUY_COMPANY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_buy_company_widgets,
--- a/rail_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/rail_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -544,8 +544,8 @@
};
static const WindowDesc _build_rail_desc = {
- 640-372, 22, 372, 36,
- WC_BUILD_TOOLBAR,0,
+ 0, 22, 372, 36,
+ WC_BUILD_TOOLBAR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_build_rail_widgets,
BuildRailToolbWndProc
@@ -953,16 +953,16 @@
};
static const WindowDesc _station_builder_desc = {
- -1, -1, 148, 200,
- WC_BUILD_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 148, 200,
+ WC_BUILD_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_station_builder_widgets,
StationBuildWndProc
};
static const WindowDesc _newstation_builder_desc = {
- -1, -1, 148, 290,
- WC_BUILD_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 148, 290,
+ WC_BUILD_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_newstation_builder_widgets,
StationBuildWndProc
@@ -1040,8 +1040,8 @@
};
static const WindowDesc _build_depot_desc = {
- -1,-1, 140, 122,
- WC_BUILD_DEPOT,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 140, 122,
+ WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_depot_widgets,
BuildTrainDepotWndProc
@@ -1126,8 +1126,8 @@
};
static const WindowDesc _build_waypoint_desc = {
- -1,-1, 344, 92,
- WC_BUILD_DEPOT,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 344, 92,
+ WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_waypoint_widgets,
BuildWaypointWndProc
--- a/road_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/road_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -309,8 +309,8 @@
};
static const WindowDesc _build_road_desc = {
- 640-240, 22, 240, 36,
- WC_BUILD_TOOLBAR,0,
+ 0, 22, 240, 36,
+ WC_BUILD_TOOLBAR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_build_road_widgets,
BuildRoadToolbWndProc
@@ -344,7 +344,7 @@
};
static const WindowDesc _build_road_scen_desc = {
- -1, -1, 174, 36,
+ WDP_AUTO, WDP_AUTO, 174, 36,
WC_SCEN_BUILD_ROAD,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_build_road_scen_widgets,
@@ -404,8 +404,8 @@
};
static const WindowDesc _build_road_depot_desc = {
- -1,-1, 140, 122,
- WC_BUILD_DEPOT,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 140, 122,
+ WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_build_road_depot_widgets,
BuildRoadDepotWndProc
@@ -500,8 +500,8 @@
};
static const WindowDesc _bus_station_picker_desc = {
- -1,-1, 140, 177,
- WC_BUS_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 140, 177,
+ WC_BUS_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_bus_station_picker_widgets,
RoadStationPickerWndProc
@@ -527,8 +527,8 @@
};
static const WindowDesc _truck_station_picker_desc = {
- -1,-1, 140, 177,
- WC_TRUCK_STATION,WC_BUILD_TOOLBAR,
+ WDP_AUTO, WDP_AUTO, 140, 177,
+ WC_TRUCK_STATION, WC_BUILD_TOOLBAR,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
_truck_station_picker_widgets,
RoadStationPickerWndProc
--- a/roadveh_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/roadveh_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -205,7 +205,7 @@
};
static const WindowDesc _roadveh_details_desc = {
- -1,-1, 380, 101,
+ WDP_AUTO, WDP_AUTO, 380, 101,
WC_VEHICLE_DETAILS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_roadveh_details_widgets,
@@ -378,7 +378,7 @@
};
static const WindowDesc _roadveh_view_desc = {
- -1,-1, 250, 116,
+ WDP_AUTO, WDP_AUTO, 250, 116,
WC_VEHICLE_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_roadveh_view_widgets,
@@ -520,7 +520,7 @@
};
static const WindowDesc _new_road_veh_desc = {
- -1, -1, 248, 230,
+ WDP_AUTO, WDP_AUTO, 248, 230,
WC_BUILD_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_new_road_veh_widgets,
--- a/ship_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/ship_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -203,7 +203,7 @@
};
static const WindowDesc _ship_details_desc = {
- -1,-1, 405, 101,
+ WDP_AUTO, WDP_AUTO, 405, 101,
WC_VEHICLE_DETAILS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_ship_details_widgets,
@@ -345,7 +345,7 @@
};
static const WindowDesc _new_ship_desc = {
- -1, -1, 255, 214,
+ WDP_AUTO, WDP_AUTO, 255, 214,
WC_BUILD_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_new_ship_widgets,
@@ -515,7 +515,7 @@
};
static const WindowDesc _ship_view_desc = {
- -1,-1, 250, 116,
+ WDP_AUTO, WDP_AUTO, 250, 116,
WC_VEHICLE_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_ship_view_widgets,
--- a/smallmap_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/smallmap_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -968,7 +968,7 @@
}
static const WindowDesc _smallmap_desc = {
- -1,-1, 446, 314,
+ WDP_AUTO, WDP_AUTO, 446, 314,
WC_SMALLMAP,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_smallmap_widgets,
@@ -1081,7 +1081,7 @@
}
static const WindowDesc _extra_view_port_desc = {
- -1,-1, 300, 268,
+ WDP_AUTO, WDP_AUTO, 300, 268,
WC_EXTRA_VIEW_PORT,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_extra_view_port_widgets,
--- a/station_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/station_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -494,7 +494,7 @@
};
static const WindowDesc _player_stations_desc = {
- -1, -1, 358, 162,
+ WDP_AUTO, WDP_AUTO, 358, 162,
WC_STATION_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_player_stations_widgets,
@@ -763,7 +763,7 @@
static const WindowDesc _station_view_desc = {
- -1, -1, 249, 110,
+ WDP_AUTO, WDP_AUTO, 249, 110,
WC_STATION_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_station_view_widgets,
--- a/subsidy_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/subsidy_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -162,7 +162,7 @@
};
static const WindowDesc _subsidies_list_desc = {
- -1, -1, 630, 127,
+ WDP_AUTO, WDP_AUTO, 630, 127,
WC_SUBSIDIES_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_subsidies_list_widgets,
--- a/terraform_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/terraform_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -266,7 +266,7 @@
static const WindowDesc _terraform_desc = {
640-157, 22+36, 158, 36,
- WC_SCEN_LAND_GEN,0,
+ WC_SCEN_LAND_GEN, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_terraform_widgets,
TerraformToolbWndProc
--- a/town_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/town_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -210,7 +210,7 @@
}
static const WindowDesc _town_authority_desc = {
- -1, -1, 317, 222,
+ WDP_AUTO, WDP_AUTO, 317, 222,
WC_TOWN_AUTHORITY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_town_authority_widgets,
@@ -304,7 +304,7 @@
};
static const WindowDesc _town_view_desc = {
- -1, -1, 260, 150,
+ WDP_AUTO, WDP_AUTO, 260, 150,
WC_TOWN_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_town_view_widgets,
@@ -327,7 +327,7 @@
};
static const WindowDesc _town_view_scen_desc = {
- -1, -1, 260, 150,
+ WDP_AUTO, WDP_AUTO, 260, 150,
WC_TOWN_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
_town_view_scen_widgets,
@@ -505,7 +505,7 @@
}
static const WindowDesc _town_directory_desc = {
- -1, -1, 208, 202,
+ WDP_AUTO, WDP_AUTO, 208, 202,
WC_TOWN_DIRECTORY,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_town_directory_widgets,
--- a/train_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/train_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -649,7 +649,7 @@
}
static const WindowDesc _new_rail_vehicle_desc = {
- -1, -1, 228, 264,
+ WDP_AUTO, WDP_AUTO, 228, 264,
WC_BUILD_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_new_rail_vehicle_widgets,
@@ -923,7 +923,7 @@
}
static const WindowDesc _train_view_desc = {
- -1,-1, 250, 134,
+ WDP_AUTO, WDP_AUTO, 250, 134,
WC_VEHICLE_VIEW,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_train_view_widgets,
@@ -1200,7 +1200,7 @@
static const WindowDesc _train_details_desc = {
- -1,-1, 370, 164,
+ WDP_AUTO, WDP_AUTO, 370, 164,
WC_VEHICLE_DETAILS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_train_details_widgets,
--- a/vehicle_gui.c Fri Nov 10 19:04:27 2006 +0000
+++ b/vehicle_gui.c Fri Nov 10 19:24:14 2006 +0000
@@ -426,7 +426,7 @@
};
static const WindowDesc _vehicle_refit_desc = {
- -1,-1, 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,
_vehicle_refit_widgets,
@@ -1278,7 +1278,7 @@
};
static const WindowDesc _replace_rail_vehicle_desc = {
- -1, -1, 456, 252,
+ WDP_AUTO, WDP_AUTO, 456, 252,
WC_REPLACE_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_replace_rail_vehicle_widgets,
@@ -1286,7 +1286,7 @@
};
static const WindowDesc _replace_road_vehicle_desc = {
- -1, -1, 456, 230,
+ WDP_AUTO, WDP_AUTO, 456, 230,
WC_REPLACE_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_replace_road_vehicle_widgets,
@@ -1294,7 +1294,7 @@
};
static const WindowDesc _replace_ship_aircraft_vehicle_desc = {
- -1, -1, 456, 214,
+ WDP_AUTO, WDP_AUTO, 456, 214,
WC_REPLACE_VEHICLE,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_replace_ship_aircraft_vehicle_widgets,
@@ -1822,15 +1822,15 @@
}
static const WindowDesc _player_vehicle_list_train_desc = {
- -1, -1, 325, 220,
- WC_TRAINS_LIST,0,
- WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
- _vehicle_list_widgets,
- PlayerVehWndProc
+ WDP_AUTO, WDP_AUTO, 325, 220,
+ WC_TRAINS_LIST, 0,
+ WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
+ _vehicle_list_widgets,
+ PlayerVehWndProc
};
static const WindowDesc _player_vehicle_list_road_veh_desc = {
- -1, -1, 260, 220,
+ WDP_AUTO, WDP_AUTO, 260, 220,
WC_ROADVEH_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets,
@@ -1838,7 +1838,7 @@
};
static const WindowDesc _player_vehicle_list_ship_desc = {
- -1, -1, 260, 182,
+ WDP_AUTO, WDP_AUTO, 260, 182,
WC_SHIPS_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets,
@@ -1846,7 +1846,7 @@
};
static const WindowDesc _player_vehicle_list_aircraft_desc = {
- -1, -1, 260, 182,
+ WDP_AUTO, WDP_AUTO, 260, 182,
WC_AIRCRAFT_LIST,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets,