diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -98,12 +98,12 @@ static const Widget _graph_legend_widget
 {   WIDGETS_END},
 };
 
-static const WindowDesc _graph_legend_desc = {
+static const WindowDesc _graph_legend_desc(
 	WDP_AUTO, WDP_AUTO, 250, 198, 250, 198,
 	WC_GRAPH_LEGEND, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	_graph_legend_widgets,
-};
+	_graph_legend_widgets
+);
 
 static void ShowGraphLegend()
 {
@@ -439,12 +439,12 @@ static const Widget _operating_profit_wi
 {   WIDGETS_END},
 };
 
-static const WindowDesc _operating_profit_desc = {
+static const WindowDesc _operating_profit_desc(
 	WDP_AUTO, WDP_AUTO, 576, 174, 576, 174,
 	WC_OPERATING_PROFIT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_operating_profit_widgets,
-};
+	_operating_profit_widgets
+);
 
 
 void ShowOperatingProfitGraph()
@@ -478,12 +478,12 @@ static const Widget _income_graph_widget
 {   WIDGETS_END},
 };
 
-static const WindowDesc _income_graph_desc = {
+static const WindowDesc _income_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_INCOME_GRAPH, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_income_graph_widgets,
-};
+	_income_graph_widgets
+);
 
 void ShowIncomeGraph()
 {
@@ -515,12 +515,12 @@ static const Widget _delivered_cargo_gra
 {   WIDGETS_END},
 };
 
-static const WindowDesc _delivered_cargo_graph_desc = {
+static const WindowDesc _delivered_cargo_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_DELIVERED_CARGO, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_delivered_cargo_graph_widgets,
-};
+	_delivered_cargo_graph_widgets
+);
 
 void ShowDeliveredCargoGraph()
 {
@@ -559,12 +559,12 @@ static const Widget _performance_history
 {   WIDGETS_END},
 };
 
-static const WindowDesc _performance_history_desc = {
+static const WindowDesc _performance_history_desc(
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_PERFORMANCE_HISTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_performance_history_widgets,
-};
+	_performance_history_widgets
+);
 
 void ShowPerformanceHistoryGraph()
 {
@@ -596,12 +596,12 @@ static const Widget _company_value_graph
 {   WIDGETS_END},
 };
 
-static const WindowDesc _company_value_graph_desc = {
+static const WindowDesc _company_value_graph_desc(
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_COMPANY_VALUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
-	_company_value_graph_widgets,
-};
+	_company_value_graph_widgets
+);
 
 void ShowCompanyValueGraph()
 {
@@ -720,12 +720,12 @@ static const Widget _cargo_payment_rates
 {   WIDGETS_END},
 };
 
-static const WindowDesc _cargo_payment_rates_desc = {
+static const WindowDesc _cargo_payment_rates_desc(
 	WDP_AUTO, WDP_AUTO, 568, 46, 568, 46,
 	WC_PAYMENT_RATES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	_cargo_payment_rates_widgets,
-};
+	_cargo_payment_rates_widgets
+);
 
 
 void ShowCargoPaymentRates()
@@ -843,12 +843,12 @@ static const Widget _company_league_widg
 {   WIDGETS_END},
 };
 
-static const WindowDesc _company_league_desc = {
+static const WindowDesc _company_league_desc(
 	WDP_AUTO, WDP_AUTO, 400, 167, 400, 167,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
-	_company_league_widgets,
-};
+	_company_league_widgets
+);
 
 void ShowCompanyLeagueTable()
 {
@@ -1088,12 +1088,12 @@ static const Widget _performance_rating_
 {   WIDGETS_END},
 };
 
-static const WindowDesc _performance_rating_detail_desc = {
+static const WindowDesc _performance_rating_detail_desc(
 	WDP_AUTO, WDP_AUTO, 299, 241, 299, 241,
 	WC_PERFORMANCE_DETAIL, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
-	_performance_rating_detail_widgets,
-};
+	_performance_rating_detail_widgets
+);
 
 void ShowPerformanceRatingDetail()
 {