openttd-ottdgrfs: comparison src/graph

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 /****************/
 /* GRAPH LEGEND */
 /****************/
-static void GraphLegendWndProc(Window *w, WindowEvent *e)
+static void GraphLegendWndProc(BaseWindow *w, WindowEvent *e)
 {
 	const Player* p;
 	switch (e->event) {
 	case WE_CREATE: {
 		}
 		break;
 	}
 }
-static const Widget _graph_legend_widgets[] = {
+static const OldWidget _graph_legend_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                       STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   249,     0,    13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   249,    14,   113, 0x0,                            STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,   247,    16,    27, 0x0,                            STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,   247,    28,    39, 0x0,                            STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 	GraphLegendWndProc
 };
 static void ShowGraphLegend(void)
 {
-	AllocateWindowDescFront(&_graph_legend_desc, 0);
+	BaseWindow::AllocateFront(&_graph_legend_desc, 0);
 }
 /********************/
 /* OPERATING PROFIT */
 /********************/
 	gd->year = yr;
 	gd->month = mo;
 }
-static void OperatingProfitWndProc(Window *w, WindowEvent *e)
+static void OperatingProfitWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		GraphDrawer gd;
 		const Player* p;
 			ShowGraphLegend();
 		break;
 	}
 }
-static const Widget _operating_profit_widgets[] = {
+static const OldWidget _operating_profit_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7025_OPERATING_PROFIT_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                    STR_704D_SHOW_KEY_TO_GRAPHS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   575,    14,   173, 0x0,                             STR_NULL},
 {   WIDGETS_END},
 };
 void ShowOperatingProfitGraph(void)
 {
-	if (AllocateWindowDescFront(&_operating_profit_desc, 0)) {
+	if (BaseWindow::AllocateFront(&_operating_profit_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
 	}
 }
 /****************/
 /* INCOME GRAPH */
 /****************/
-static void IncomeGraphWndProc(Window *w, WindowEvent *e)
+static void IncomeGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		GraphDrawer gd;
 		const Player* p;
 			ShowGraphLegend();
 		break;
 	}
 }
-static const Widget _income_graph_widgets[] = {
+static const OldWidget _income_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7022_INCOME_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,          STR_704D_SHOW_KEY_TO_GRAPHS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   575,    14,   141, 0x0,                   STR_NULL},
 {   WIDGETS_END},
 	IncomeGraphWndProc
 };
 void ShowIncomeGraph(void)
 {
-	if (AllocateWindowDescFront(&_income_graph_desc, 0)) {
+	if (BaseWindow::AllocateFront(&_income_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
 	}
 }
 /*******************/
 /* DELIVERED CARGO */
 /*******************/
-static void DeliveredCargoGraphWndProc(Window *w, WindowEvent *e)
+static void DeliveredCargoGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		GraphDrawer gd;
 		const Player* p;
 			ShowGraphLegend();
 		break;
 	}
 }
-static const Widget _delivered_cargo_graph_widgets[] = {
+static const OldWidget _delivered_cargo_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7050_UNITS_OF_CARGO_DELIVERED, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                      STR_704D_SHOW_KEY_TO_GRAPHS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   575,    14,   141, 0x0,                               STR_NULL},
 {   WIDGETS_END},
 	DeliveredCargoGraphWndProc
 };
 void ShowDeliveredCargoGraph(void)
 {
-	if (AllocateWindowDescFront(&_delivered_cargo_graph_desc, 0)) {
+	if (BaseWindow::AllocateFront(&_delivered_cargo_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
 	}
 }
 /***********************/
 /* PERFORMANCE HISTORY */
 /***********************/
-static void PerformanceHistoryWndProc(Window *w, WindowEvent *e)
+static void PerformanceHistoryWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		GraphDrawer gd;
 		const Player* p;
 			ShowPerformanceRatingDetail();
 		break;
 	}
 }
-static const Widget _performance_history_widgets[] = {
+static const OldWidget _performance_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                             STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   475,     0,    13, STR_7051_COMPANY_PERFORMANCE_RATINGS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                         STR_704D_SHOW_KEY_TO_GRAPHS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   476,   525,     0,    13, STR_PERFORMANCE_DETAIL_KEY,           STR_704D_SHOW_KEY_TO_GRAPHS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   575,    14,   237, 0x0,                                  STR_NULL},
 	PerformanceHistoryWndProc
 };
 void ShowPerformanceHistoryGraph(void)
 {
-	if (AllocateWindowDescFront(&_performance_history_desc, 0)) {
+	if (BaseWindow::AllocateFront(&_performance_history_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
 	}
 }
 /*****************/
 /* COMPANY VALUE */
 /*****************/
-static void CompanyValueGraphWndProc(Window *w, WindowEvent *e)
+static void CompanyValueGraphWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		GraphDrawer gd;
 		const Player* p;
 			ShowGraphLegend();
 		break;
 	}
 }
-static const Widget _company_value_graph_widgets[] = {
+static const OldWidget _company_value_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7052_COMPANY_VALUES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,            STR_704D_SHOW_KEY_TO_GRAPHS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   575,    14,   237, 0x0,                     STR_NULL},
 {   WIDGETS_END},
 	CompanyValueGraphWndProc
 };
 void ShowCompanyValueGraph(void)
 {
-	if (AllocateWindowDescFront(&_company_value_graph_desc, 0)) {
+	if (BaseWindow::AllocateFront(&_company_value_graph_desc, 0)) {
 		InvalidateWindow(WC_GRAPH_LEGEND, 0);
 	}
 }
 /*****************/
 /* PAYMENT RATES */
 /*****************/
-static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e)
+static void CargoPaymentRatesWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: {
 		uint i;
 		for (i = 3; i < w->widget_count; i++) {
 		}
 	} break;
 	}
 }
-static const Widget _cargo_payment_rates_widgets[] = {
+static const OldWidget _cargo_payment_rates_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                     STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   567,     0,    13, STR_7061_CARGO_PAYMENT_RATES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   567,    14,   141, 0x0,                          STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    24,    31, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {      WWT_PANEL,   RESIZE_NONE,    12,   493,   562,    32,    39, 0x0,                          STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 };
 void ShowCargoPaymentRates(void)
 {
-	AllocateWindowDescFront(&_cargo_payment_rates_desc, 0);
+	BaseWindow::AllocateFront(&_cargo_payment_rates_desc, 0);
 }
 /************************/
 /* COMPANY LEAGUE TABLE */
 /************************/
 	const Player* p2 = *(const Player* const*)elem2;
 	return p2->old_economy[1].performance_history - p1->old_economy[1].performance_history;
 }
-static void CompanyLeagueWndProc(Window *w, WindowEvent *e)
+static void CompanyLeagueWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_PAINT: {
 			const Player* plist[MAX_PLAYERS];
 			const Player* p;
 		}
 	}
 }
-static const Widget _company_league_widgets[] = {
+static const OldWidget _company_league_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE, 14,   0,  10,  0, 13, STR_00C5,                      STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION, RESIZE_NONE, 14,  11, 387,  0, 13, STR_7053_COMPANY_LEAGUE_TABLE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX, RESIZE_NONE, 14, 388, 399,  0, 13, STR_NULL,                      STR_STICKY_BUTTON},
 {      WWT_PANEL, RESIZE_NONE, 14,   0, 399, 14, 96, 0x0,                           STR_NULL},
 {   WIDGETS_END},
 	CompanyLeagueWndProc
 };
 void ShowCompanyLeagueTable(void)
 {
-	AllocateWindowDescFront(&_company_league_desc,0);
+	BaseWindow::AllocateFront(&_company_league_desc,0);
 }
 /*****************************/
 /* PERFORMANCE RATING DETAIL */
 /*****************************/
-static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
+static void PerformanceRatingDetailWndProc(BaseWindow *w, WindowEvent *e)
 {
 	static PlayerID _performance_rating_detail_player = INVALID_PLAYER;
 	switch (e->event) {
 		case WE_PAINT: {
 			break;
 		}
 	}
 }
-static const Widget _performance_rating_detail_widgets[] = {
+static const OldWidget _performance_rating_detail_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,               STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   298,     0,    13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   298,    14,    27, 0x0,                    STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   298,    28,    47, 0x0,                    STR_PERFORMANCE_DETAIL_VEHICLES_TIP},
 	PerformanceRatingDetailWndProc
 };
 void ShowPerformanceRatingDetail(void)
 {
-	AllocateWindowDescFront(&_performance_rating_detail_desc, 0);
+	BaseWindow::AllocateFront(&_performance_rating_detail_desc, 0);
 }

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6251	cd413fa2e252
child 6268	4b5241e5dd10