openttd-ottdgrfs: comparison src/misc

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 	LAND_INFO_LINE_BUFF_SIZE = 512,
 };
 static char _landinfo_data[LAND_INFO_LINES][LAND_INFO_LINE_BUFF_SIZE];
-static void LandInfoWndProc(Window *w, WindowEvent *e)
+static void LandInfoWndProc(BaseWindow *w, WindowEvent *e)
 {
 	if (e->event == WE_PAINT) {
 		w->DrawWidgets();
 		DoDrawStringCentered(140, 16, _landinfo_data[0], 13);
 		if (_landinfo_data[5][0] != '\0') DrawStringMultiCenter(140, 76, BindCString(_landinfo_data[5]), 276);
 		if (_landinfo_data[6][0] != '\0') DoDrawStringCentered(140, 71, _landinfo_data[6], 0);
 	}
 }
-static const Widget _land_info_widgets[] = {
+static const OldWidget _land_info_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                       STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   279,     0,    13, STR_01A3_LAND_AREA_INFORMATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   279,    14,    92, 0x0,                            STR_NULL},
 {    WIDGETS_END},
 };
 };
 static void Place_LandInfo(TileIndex tile)
 {
 	Player *p;
-	Window *w;
+	BaseWindow *w;
 	Town *t;
 	int64 old_money;
 	int64 costclear;
 	AcceptedCargo ac;
 	TileDesc td;
 	StringID str;
 	DeleteWindowById(WC_LAND_INFO, 0);
-	w = AllocateWindowDesc(&_land_info_desc);
+	w = BaseWindow::Allocate(&_land_info_desc);
 	WP(w, void_d).data = &_landinfo_data;
 	p = GetPlayer(IsValidPlayer(_local_player) ? _local_player : PLAYER_FIRST);
 	t = ClosestTownFromTile(tile, _patches.dist_local_authority);
 	"",
 	"And last but not least:",
 	"  Chris Sawyer - For an amazing game!"
 };
-static void AboutWindowProc(Window *w, WindowEvent *e)
+static void AboutWindowProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: /* Set up window counter and start position of scroller */
 		WP(w, scroller_d).counter = 0;
 		WP(w, scroller_d).height = w->height - 40;
 		}
 		break;
 	}
 }
-static const Widget _about_widgets[] = {
+static const OldWidget _about_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   419,     0,    13, STR_015B_OPENTTD, STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   419,    14,   271, 0x0,              STR_NULL},
 {      WWT_FRAME,   RESIZE_NONE,    14,     5,   414,    40,   245, STR_NULL,         STR_NULL},
 {    WIDGETS_END},
 void ShowAboutWindow(void)
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
-	AllocateWindowDesc(&_about_desc);
+	BaseWindow::Allocate(&_about_desc);
 }
 static int _tree_to_plant;
 static const PalSpriteID _tree_sprites[] = {
 	{ 0x75F, PAL_NONE }, { 0x774, PAL_NONE }, { 0x720, PAL_NONE }, { 0x797, PAL_NONE },
 	{ 0x79E, PAL_NONE }, { 0x7A5, PALETTE_TO_GREEN }, { 0x7AC, PALETTE_TO_RED }, { 0x7B3, PAL_NONE },
 	{ 0x7BA, PAL_NONE }, { 0x7C1, PALETTE_TO_RED, }, { 0x7C8, PALETTE_TO_PALE_GREEN }, { 0x7CF, PALETTE_TO_YELLOW }, { 0x7D6, PALETTE_TO_RED }
 };
-static void BuildTreesWndProc(Window *w, WindowEvent *e)
+static void BuildTreesWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		int x,y;
 		int i, count;
 		w->RaiseButtons();
 		break;
 	}
 }
-static const Widget _build_trees_widgets[] = {
+static const OldWidget _build_trees_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   142,     0,    13, STR_2802_TREES,        STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,     7,     0,   142,    14,   170, 0x0,                   STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,    35,    16,    61, 0x0,                   STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,   RESIZE_NONE,    14,    37,    70,    16,    61, 0x0,                   STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_trees_widgets,
 	BuildTreesWndProc
 };
-static const Widget _build_trees_scen_widgets[] = {
+static const OldWidget _build_trees_scen_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   142,     0,    13, STR_2802_TREES,        STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,     7,     0,   142,    14,   183, 0x0,                   STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,    35,    16,    61, 0x0,                   STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,   RESIZE_NONE,    14,    37,    70,    16,    61, 0x0,                   STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 void ShowBuildTreesToolbar(void)
 {
 	if (!IsValidPlayer(_current_player)) return;
-	AllocateWindowDescFront(&_build_trees_desc, 0);
+	BaseWindow::AllocateFront(&_build_trees_desc, 0);
 }
 void ShowBuildTreesScenToolbar(void)
 {
-	AllocateWindowDescFront(&_build_trees_scen_desc, 0);
+	BaseWindow::AllocateFront(&_build_trees_scen_desc, 0);
 }
 static uint32 _errmsg_decode_params[20];
 static StringID _errmsg_message_1, _errmsg_message_2;
 static uint _errmsg_duration;
-static const Widget _errmsg_widgets[] = {
+static const OldWidget _errmsg_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     4,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,     4,    11,   239,     0,    13, STR_00B2_MESSAGE, STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,     4,     0,   239,    14,    45, 0x0,              STR_NULL},
 {    WIDGETS_END},
 };
-static const Widget _errmsg_face_widgets[] = {
+static const OldWidget _errmsg_face_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     4,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,     4,    11,   333,     0,    13, STR_00B3_MESSAGE_FROM, STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,     4,     0,   333,    14,   136, 0x0,                   STR_NULL},
 {   WIDGETS_END},
 };
-static void ErrmsgWndProc(Window *w, WindowEvent *e)
+static void ErrmsgWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT:
 		COPY_IN_DPARAM(0, _errmsg_decode_params, lengthof(_errmsg_decode_params));
 		w->DrawWidgets();
 	}
 }
 void ShowErrorMessage(StringID msg_1, StringID msg_2, int x, int y)
 {
-	Window *w;
+	BaseWindow *w;
 	const ViewPort *vp;
 	Point pt;
 	DeleteWindowById(WC_ERRMSG, 0);
 	if (_errmsg_message_1 != STR_013B_OWNED_BY || GetDParamX(_errmsg_decode_params,2) >= 8) {
 		if ( (x|y) != 0) {
 			pt = RemapCoords2(x, y);
-			vp = Window::FindById(WC_MAIN_WINDOW, 0)->viewport;
+			vp = BaseWindow::FindById(WC_MAIN_WINDOW, 0)->viewport;
 			// move x pos to opposite corner
 			pt.x = ((pt.x - vp->virtual_left) >> vp->zoom) + vp->left;
 			pt.x = (pt.x < (_screen.width >> 1)) ? _screen.width - 260 : 20;
 		} else {
 			pt.x = (_screen.width - 240) >> 1;
 			pt.y = (_screen.height - 46) >> 1;
 		}
-		w = Window::Allocate(pt.x, pt.y, 240, 46, ErrmsgWndProc, WC_ERRMSG, _errmsg_widgets);
+		w = BaseWindow::Allocate(pt.x, pt.y, 240, 46, ErrmsgWndProc, WC_ERRMSG, _errmsg_widgets);
 	} else {
 		if ( (x|y) != 0) {
 			pt = RemapCoords2(x, y);
-			vp = Window::FindById(WC_MAIN_WINDOW, 0)->viewport;
+			vp = BaseWindow::FindById(WC_MAIN_WINDOW, 0)->viewport;
 			pt.x = clamp(((pt.x - vp->virtual_left) >> vp->zoom) + vp->left - (334/2), 0, _screen.width - 334);
 			pt.y = clamp(((pt.y - vp->virtual_top) >> vp->zoom) + vp->top - (137/2), 22, _screen.height - 137);
 		} else {
 			pt.x = (_screen.width - 334) >> 1;
 			pt.y = (_screen.height - 137) >> 1;
 		}
-		w = Window::Allocate(pt.x, pt.y, 334, 137, ErrmsgWndProc, WC_ERRMSG, _errmsg_face_widgets);
+		w = BaseWindow::Allocate(pt.x, pt.y, 334, 137, ErrmsgWndProc, WC_ERRMSG, _errmsg_face_widgets);
 	}
 	w->desc_flags = WDF_STD_BTN | WDF_DEF_WIDGET;
 }
 	SetDParam(0, cost);
 	AddTextEffect(STR_FEEDER, pt.x, pt.y, 0x250);
 }
-static const Widget _tooltips_widgets[] = {
+static const OldWidget _tooltips_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   199,     0,    31, 0x0, STR_NULL},
 {   WIDGETS_END},
 };
-static void TooltipsWndProc(Window *w, WindowEvent *e)
+static void TooltipsWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_PAINT: {
 			uint arg;
 			GfxFillRect(0, 0, w->width - 1, w->height - 1, 0);
 * added to a tooltip; currently only supports parameters of {NUM} (integer) */
 void GuiShowTooltipsWithArgs(StringID str, uint paramcount, const uint32 params[])
 {
 	char buffer[512];
 	BoundingRect br;
-	Window *w;
+	BaseWindow *w;
 	uint i;
 	int x, y;
 	DeleteWindowById(WC_TOOLTIPS, 0);
 	 * go below window, flip it so it is shown above the cursor */
 	y = clamp(_cursor.pos.y + _cursor.size.y + _cursor.offs.y + 5, 22, _screen.height - 12);
 	if (y + br.height > _screen.height - 12) y = _cursor.pos.y + _cursor.offs.y - br.height - 5;
 	x = clamp(_cursor.pos.x - (br.width >> 1), 0, _screen.width - br.width);
-	w = Window::Allocate(x, y, br.width, br.height, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets);
+	w = BaseWindow::Allocate(x, y, br.width, br.height, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets);
 	WP(w, tooltips_d).string_id = str;
 	assert(sizeof(WP(w, tooltips_d).params[0]) == sizeof(params[0]));
 	memcpy(WP(w, tooltips_d).params, params, sizeof(WP(w, tooltips_d).params[0]) * paramcount);
 	WP(w, tooltips_d).paramcount = paramcount;
 		GetAcceptanceAroundTiles(accepts, tile, _thd.size.x / TILE_SIZE, _thd.size.y / TILE_SIZE , rad);
 		DrawStationCoverageText(accepts, sx, sy, mask);
 	}
 }
-void CheckRedrawStationCoverage(const Window *w)
+void CheckRedrawStationCoverage(const BaseWindow *w)
 {
 	if (_thd.dirty & 1) {
 		_thd.dirty &= ~1;
 		w->SetDirty();
 	}
 }
-void SetVScrollCount(Window *w, int num)
+void SetVScrollCount(BaseWindow *w, int num)
 {
 	w->vscroll.count = num;
 	num -= w->vscroll.cap;
 	if (num < 0) num = 0;
 	if (num < w->vscroll.pos) w->vscroll.pos = num;
 }
-void SetVScroll2Count(Window *w, int num)
+void SetVScroll2Count(BaseWindow *w, int num)
 {
 	w->vscroll2.count = num;
 	num -= w->vscroll2.cap;
 	if (num < 0) num = 0;
 	if (num < w->vscroll2.pos) w->vscroll2.pos = num;
 }
-void SetHScrollCount(Window *w, int num)
+void SetHScrollCount(BaseWindow *w, int num)
 {
 	w->hscroll.count = num;
 	num -= w->hscroll.cap;
 	if (num < 0) num = 0;
 	if (num < w->hscroll.pos) w->hscroll.pos = num;
 	tb->caretpos = tb->length;
 	tb->caretxoffs = tb->width;
 }
-int HandleEditBoxKey(Window *w, querystr_d *string, int wid, WindowEvent *e)
+int HandleEditBoxKey(BaseWindow *w, querystr_d *string, int wid, WindowEvent *e)
 {
 	e->we.keypress.cont = false;
 	switch (e->we.keypress.keycode) {
 	case WKC_ESC: return 2;
 		return true;
 	}
 	return false;
 }
-void HandleEditBox(Window *w, querystr_d *string, int wid)
+void HandleEditBox(BaseWindow *w, querystr_d *string, int wid)
 {
 	if (HandleCaret(&string->text)) w->InvalidateWidget(wid);
 }
-void DrawEditBox(Window *w, querystr_d *string, int wid)
+void DrawEditBox(BaseWindow *w, querystr_d *string, int wid)
 {
 	DrawPixelInfo dpi, *old_dpi;
 	int delta;
-	const Widget *wi = &w->widget[wid];
+	const OldWidget *wi = &w->widget[wid];
 	const Textbuf *tb = &string->text;
 	GfxFillRect(wi->left + 1, wi->top + 1, wi->right - 1, wi->bottom - 1, 215);
 	/* Limit the drawing of the string inside the widget boundaries */
 	QUERY_STR_WIDGET_CANCEL,
 	QUERY_STR_WIDGET_OK
 };
-static void QueryStringWndProc(Window *w, WindowEvent *e)
+static void QueryStringWndProc(BaseWindow *w, WindowEvent *e)
 {
 	querystr_d *qs = &WP(w, querystr_d);
 	switch (e->event) {
 		case WE_CREATE:
 		case WE_CLICK:
 			switch (e->we.click.widget) {
 				case QUERY_STR_WIDGET_OK:
 		press_ok:;
 					if (qs->orig == NULL || strcmp(qs->text.buf, qs->orig) != 0) {
-						Window *parent = w->parent;
+						BaseWindow *parent = w->parent;
 						qs->handled = true;
 						/* If the parent is NULL, the editbox is handled by general function
 						 * HandleOnEditText */
 						if (parent != NULL) {
 			break;
 		case WE_DESTROY: /* Call cancellation of query, if we have not handled it before */
 			if (!qs->handled && w->parent != NULL) {
 				WindowEvent e;
-				Window *parent = w->parent;
+				BaseWindow *parent = w->parent;
 				qs->handled = true;
 				e.event = WE_ON_EDIT_TEXT_CANCEL;
 				parent->wndproc(parent, &e);
 			}
 			CLRBIT(_no_scroll, SCROLL_EDIT);
 			break;
 		}
 }
-static const Widget _query_string_widgets[] = {
+static const OldWidget _query_string_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,        STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   259,     0,    13, STR_012D,        STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   259,    14,    29, 0x0,             STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     2,   257,    16,    27, 0x0,             STR_NULL},
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     0,   129,    30,    41, STR_012E_CANCEL, STR_NULL},
 * @param str StringID for the text shown in the textbox
 * @param caption StringID of text shown in caption of querywindow
 * @param maxlen maximum length in characters allowed. If bit 12 is set we
 * will not check the resulting string against to original string to return success
 * @param maxwidth maximum width in pixels allowed
-* @param parent pointer to a Window that will handle the events (ok/cancel) of this
+* @param parent pointer to a BaseWindow that will handle the events (ok/cancel) of this
 * window. If NULL, results are handled by global function HandleOnEditText
 * @param afilter filters out unwanted character input */
-void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, Window *parent, CharSetFilter afilter)
+void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth, BaseWindow *parent, CharSetFilter afilter)
 {
 	static char orig_str_buf[lengthof(_edit_str_buf)];
-	Window *w;
+	BaseWindow *w;
 	uint realmaxlen = maxlen & ~0x1000;
 	assert(realmaxlen < lengthof(_edit_str_buf));
 	DeleteWindowById(WC_QUERY_STRING, 0);
 	DeleteWindowById(WC_SAVELOAD, 0);
-	w = AllocateWindowDesc(&_query_string_desc);
+	w = BaseWindow::Allocate(&_query_string_desc);
 	w->parent = parent;
 	GetString(_edit_str_buf, str, lastof(_edit_str_buf));
 	_edit_str_buf[realmaxlen - 1] = '\0';
 	QUERY_WIDGET_YES
 };
 typedef struct query_d {
-	void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise
+	void (*proc)(BaseWindow*, bool); ///< callback function executed on closing of popup. BaseWindow* points to parent, bool is true if 'yes' clicked, false otherwise
 	StringID message;            ///< message shown for query window
 	uint32 params[20];           ///< local copy of _decode_parameters
 	bool calledback;             ///< has callback been executed already (internal usage for WE_DESTROY event)
 } query_d;
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d));
-static void QueryWndProc(Window *w, WindowEvent *e)
+static void QueryWndProc(BaseWindow *w, WindowEvent *e)
 {
 	query_d *q = &WP(w, query_d);
 	switch (e->event) {
 		case WE_PAINT:
 			break;
 	}
 }
-static const Widget _query_widgets[] = {
+static const OldWidget _query_widgets[] = {
 {  WWT_CLOSEBOX, RESIZE_NONE,  4,   0,  10,   0,  13, STR_00C5,        STR_018B_CLOSE_WINDOW},
 {   WWT_CAPTION, RESIZE_NONE,  4,  11, 209,   0,  13, STR_NULL,        STR_NULL},
 {     WWT_PANEL, RESIZE_NONE,  4,   0, 209,  14,  81, 0x0, /*OVERRIDE*/STR_NULL},
 {WWT_PUSHTXTBTN, RESIZE_NONE,  3,  20,  90,  62,  73, STR_00C9_NO,     STR_NULL},
 {WWT_PUSHTXTBTN, RESIZE_NONE,  3, 120, 190,  62,  73, STR_00C8_YES,    STR_NULL},
 * @param message string that will be shown for the window
 * @param parent pointer to parent window, if this pointer is NULL the parent becomes
 * the main window WC_MAIN_WINDOW
 * @param x,y coordinates to show the window at
 * @param yes_no_callback callback function called when window is closed through any button */
-void ShowQuery(StringID caption, StringID message, Window *parent, void (*callback)(Window*, bool))
+void ShowQuery(StringID caption, StringID message, BaseWindow *parent, void (*callback)(BaseWindow*, bool))
 {
-	Window *w = AllocateWindowDesc(&_query_desc);
+	BaseWindow *w = BaseWindow::Allocate(&_query_desc);
 	if (w == NULL) return;
-	if (parent == NULL) parent = Window::FindById(WC_MAIN_WINDOW, 0);
+	if (parent == NULL) parent = BaseWindow::FindById(WC_MAIN_WINDOW, 0);
 	w->parent = parent;
 	w->left = parent->left + (parent->width / 2) - (w->width / 2);
 	w->top = parent->top + (parent->height / 2) - (w->height / 2);
 	/* Create a backup of the variadic arguments to strings because it will be
 	WP(w, query_d).proc       = callback;
 	WP(w, query_d).calledback = false;
 }
-static const Widget _load_dialog_widgets[] = {
+static const OldWidget _load_dialog_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   256,     0,    13, STR_NULL,         STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_ORDER_TIP},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   128,   256,    14,    25, STR_SORT_BY_DATE, STR_SORT_ORDER_TIP},
 {      WWT_PANEL,  RESIZE_RIGHT,    14,     0,   256,    26,    47, 0x0,              STR_NULL},
 {  WWT_SCROLLBAR,    RESIZE_LRB,    14,   245,   256,    60,   281, 0x0,              STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   245,   256,   282,   293, 0x0,              STR_RESIZE_BUTTON},
 {   WIDGETS_END},
 };
-static const Widget _save_dialog_widgets[] = {
+static const OldWidget _save_dialog_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,    14,    11,   256,     0,    13, STR_NULL,         STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_ORDER_TIP},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   128,   256,    14,    25, STR_SORT_BY_DATE, STR_SORT_ORDER_TIP},
 {      WWT_PANEL,  RESIZE_RIGHT,    14,     0,   256,    26,    47, 0x0,              STR_NULL},
 	GetString(_edit_str_buf, STR_4004, lastof(_edit_str_buf));
 }
 extern void StartupEngines(void);
-static void SaveLoadDlgWndProc(Window *w, WindowEvent *e)
+static void SaveLoadDlgWndProc(BaseWindow *w, WindowEvent *e)
 {
 	static FiosItem o_dir;
 	switch (e->event) {
 	case WE_CREATE: { /* Set up OPENTTD button */
 		}
 		FiosFreeSavegameList();
 		CLRBIT(_no_scroll, SCROLL_SAVE);
 		break;
 	case WE_RESIZE: {
-		/* Widget 2 and 3 have to go with halve speed, make it so obiwan */
+		/* OldWidget 2 and 3 have to go with halve speed, make it so obiwan */
 		uint diff = e->we.sizing.diff.x / 2;
 		w->widget[2].right += diff;
 		w->widget[3].left  += diff;
 		w->widget[3].right += e->we.sizing.diff.x;
 		STR_4000_SAVE_GAME,
 		STR_0299_SAVE_SCENARIO,
 		STR_4011_LOAD_HEIGHTMAP,
 	};
-	Window *w;
+	BaseWindow *w;
 	const WindowDesc *sld = &_save_dialog_desc;
 	SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, 0, WC_MAIN_WINDOW, 0);
 	DeleteWindowById(WC_QUERY_STRING, 0);
 		case SLD_SAVE_SCENARIO: strcpy(_edit_str_buf, "UNNAMED"); break;
 		default:                sld = &_load_dialog_desc; break;
 	}
 	assert((uint)mode < lengthof(saveload_captions));
-	w = AllocateWindowDesc(sld);
+	w = BaseWindow::Allocate(sld);
 	w->widget[1].data = saveload_captions[mode];
 	w->vscroll.cap = 24;
 	w->resize.step_width = 2;
 	w->resize.step_height = 10;
 	w->resize.height = w->height - 14 * 10; // Minimum of 10 items
 	ResetObjectToPlace();
 }
 void RedrawAutosave(void)
 {
-	Window::SetDirtyById(WC_STATUS_BAR, 0);
+	BaseWindow::SetDirtyById(WC_STATUS_BAR, 0);
 }
 void SetFiosType(const byte fiostype)
 {
 	switch (fiostype) {
 	if ((ymd.year == MIN_YEAR && p2 == -1) || (ymd.year == MAX_YEAR && p2 == 1)) return _cur_year;
 	SetDate(ConvertYMDToDate(_cur_year + p2, ymd.month, ymd.day));
 	EnginesMonthlyLoop();
-	Window::SetDirtyById(WC_STATUS_BAR, 0);
+	BaseWindow::SetDirtyById(WC_STATUS_BAR, 0);
 	return _cur_year;
 }
 typedef int32 CheckButtonClick(int32, int32);
 	{SLE_UINT8, {CE_NONE}, STR_CHEAT_SWITCH_CLIMATE, &_opt.landscape,                &_cheats.switch_climate.been_used,  &ClickChangeClimateCheat,-1,  4},
 	{SLE_INT32, {CE_NONE}, STR_CHEAT_CHANGE_DATE,    &_cur_year,                     &_cheats.change_date.been_used,     &ClickChangeDateCheat,   -1,  1},
 };
-static const Widget _cheat_widgets[] = {
+static const OldWidget _cheat_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,   STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   399,     0,    13, STR_CHEATS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   399,    14,   169, 0x0,        STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   399,    14,   169, 0x0,        STR_CHEATS_TIP},
 {   WIDGETS_END},
 };
-static void CheatsWndProc(Window *w, WindowEvent *e)
+static void CheatsWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		int clk = WP(w,def_d).data_1;
 		int x, y;
 void ShowCheatWindow(void)
 {
 	DeleteWindowById(WC_CHEATS, 0);
-	AllocateWindowDesc(&_cheats_desc);
+	BaseWindow::Allocate(&_cheats_desc);
 }

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6251	cd413fa2e252
child 6263	19dab6a68886