openttd-ottdgrfs: comparison src/misc

equal deleted inserted replaced

-:42bf2d268a86
+:5077e6ed3788
 		DrawStringCentered(210, w->height - 15, STR_00BA_COPYRIGHT_OPENTTD, 0);
 	}	break;
 	case WE_MOUSELOOP: /* Timer to scroll the text and adjust the new top */
 		if (WP(w, scroller_d).counter++ % 3 == 0) {
 			WP(w, scroller_d).height--;
-			SetWindowDirty(w);
+			w->SetDirty();
 		}
 		break;
 	}
 }
 	case WE_TIMEOUT:
 		RaiseWindowWidget(w, 16);
 		break;
 	case WE_ABORT_PLACE_OBJ:
-		RaiseWindowButtons(w);
+		w->RaiseButtons();
 		break;
 	}
 }
 static const Widget _build_trees_widgets[] = {
 					238);
 		}
 		break;
 	case WE_MOUSELOOP:
-		if (_right_button_down) DeleteWindow(w);
+		if (_right_button_down) w->Close();
 		break;
 	case WE_4:
-		if (--_errmsg_duration == 0) DeleteWindow(w);
+		if (--_errmsg_duration == 0) w->Close();
 		break;
 	case WE_DESTROY:
 		SetRedErrorSquare(0);
 		_switch_mode_errorstr = INVALID_STRING_ID;
 	case WE_KEYPRESS:
 		if (e->we.keypress.keycode == WKC_SPACE) {
 			// Don't continue.
 			e->we.keypress.cont = false;
-			DeleteWindow(w);
+			w->Close();
 		}
 		break;
 	}
 }
 	if (_errmsg_message_1 != STR_013B_OWNED_BY || GetDParamX(_errmsg_decode_params,2) >= 8) {
 		if ( (x|y) != 0) {
 			pt = RemapCoords2(x, y);
-			vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;
+			vp = Window::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 = AllocateWindow(pt.x, pt.y, 240, 46, ErrmsgWndProc, WC_ERRMSG, _errmsg_widgets);
+		w = Window::Allocate(pt.x, pt.y, 240, 46, ErrmsgWndProc, WC_ERRMSG, _errmsg_widgets);
 	} else {
 		if ( (x|y) != 0) {
 			pt = RemapCoords2(x, y);
-			vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;
+			vp = Window::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 = AllocateWindow(pt.x, pt.y, 334, 137, ErrmsgWndProc, WC_ERRMSG, _errmsg_face_widgets);
+		w = Window::Allocate(pt.x, pt.y, 334, 137, ErrmsgWndProc, WC_ERRMSG, _errmsg_face_widgets);
 	}
 	w->desc_flags = WDF_STD_BTN | WDF_DEF_WIDGET;
 }
 		case WE_MOUSELOOP:
 			/* We can show tooltips while dragging tools. These are shown as long as
 			 * we are dragging the tool. Normal tooltips work with rmb */
 			if (WP(w, tooltips_d).paramcount == 0 ) {
-				if (!_right_button_down) DeleteWindow(w);
+				if (!_right_button_down) w->Close();
 			} else {
-				if (!_left_button_down) DeleteWindow(w);
+				if (!_left_button_down) w->Close();
 			}
 			break;
 	}
 }
 	 * 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 = AllocateWindow(x, y, br.width, br.height, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets);
+	w = Window::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;
 void CheckRedrawStationCoverage(const Window *w)
 {
 	if (_thd.dirty & 1) {
 		_thd.dirty &= ~1;
-		SetWindowDirty(w);
+		w->SetDirty();
 	}
 }
 void SetVScrollCount(Window *w, int num)
 {
 							HandleOnEditText(qs->text.buf);
 						}
 					}
 					/* Fallthrough */
 				case QUERY_STR_WIDGET_CANCEL:
-					DeleteWindow(w);
+					w->Close();
 					break;
 			}
 			break;
 		case WE_MOUSELOOP:
 			break;
 		case WE_KEYPRESS:
 			switch (HandleEditBoxKey(w, qs, QUERY_STR_WIDGET_TEXT, e)) {
 				case 1: goto press_ok; /* Enter pressed, confirms change */
-				case 2: DeleteWindow(w); break; /* ESC pressed, closes window, abandons changes */
+				case 2: w->Close(); break; /* ESC pressed, closes window, abandons changes */
 			}
 			break;
 		case WE_DESTROY: /* Call cancellation of query, if we have not handled it before */
 			if (!qs->handled && w->parent != NULL) {
 				case QUERY_WIDGET_YES:
 					q->calledback = true;
 					if (q->proc != NULL) q->proc(w->parent, true);
 					/* Fallthrough */
 				case QUERY_WIDGET_NO:
-					DeleteWindow(w);
+					w->Close();
 					break;
 				}
 			break;
 		case WE_KEYPRESS: /* ESC closes the window, Enter confirms the action */
 					q->calledback = true;
 					if (q->proc != NULL) q->proc(w->parent, true);
 					/* Fallthrough */
 				case WKC_ESC:
 					e->we.keypress.cont = false;
-					DeleteWindow(w);
+					w->Close();
 					break;
 			}
 			break;
 		case WE_DESTROY: /* Call callback function (if any) on window close if not yet called */
 void ShowQuery(StringID caption, StringID message, Window *parent, void (*callback)(Window*, bool))
 {
 	Window *w = AllocateWindowDesc(&_query_desc);
 	if (w == NULL) return;
-	if (parent == NULL) parent = FindWindowById(WC_MAIN_WINDOW, 0);
+	if (parent == NULL) parent = Window::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
 		switch (e->we.click.widget) {
 		case 2: /* Sort save names by name */
 			_savegame_sort_order = (_savegame_sort_order == SORT_BY_NAME) ?
 				SORT_BY_NAME | SORT_DESCENDING : SORT_BY_NAME;
 			_savegame_sort_dirty = true;
-			SetWindowDirty(w);
+			w->SetDirty();
 			break;
 		case 3: /* Sort save names by date */
 			_savegame_sort_order = (_savegame_sort_order == SORT_BY_DATE) ?
 				SORT_BY_DATE | SORT_DESCENDING : SORT_BY_DATE;
 			_savegame_sort_dirty = true;
-			SetWindowDirty(w);
+			w->SetDirty();
 			break;
 		case 6: /* OpenTTD 'button', jumps to OpenTTD directory */
 			FiosBrowseTo(&o_dir);
-			SetWindowDirty(w);
+			w->SetDirty();
 			BuildFileList();
 			break;
 		case 7: { /* Click the listbox */
 			int y = (e->we.click.pt.y - w->widget[e->we.click.widget].top - 1) / 10;
 					SetFiosType(file->type);
 					ttd_strlcpy(_file_to_saveload.name, name, sizeof(_file_to_saveload.name));
 					ttd_strlcpy(_file_to_saveload.title, file->title, sizeof(_file_to_saveload.title));
-					DeleteWindow(w);
+					w->Close();
 				} else if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
 					SetFiosType(file->type);
 					ttd_strlcpy(_file_to_saveload.name, name, sizeof(_file_to_saveload.name));
 					ttd_strlcpy(_file_to_saveload.title, file->title, sizeof(_file_to_saveload.title));
-					DeleteWindow(w);
+					w->Close();
 					ShowHeightmapLoad();
 				} else {
 					// SLD_SAVE_GAME, SLD_SAVE_SCENARIO copy clicked name to editbox
 					ttd_strlcpy(WP(w, querystr_d).text.buf, file->title, WP(w, querystr_d).text.maxlength);
 					UpdateTextBufferSize(&WP(w, querystr_d).text);
 					InvalidateWidget(w, 10);
 				}
 			} else {
 				// Changed directory, need repaint.
-				SetWindowDirty(w);
+				w->SetDirty();
 				BuildFileList();
 			}
 			break;
 		}
 			HandleEditBox(w, &WP(w, querystr_d), 10);
 		}
 		break;
 	case WE_KEYPRESS:
 		if (e->we.keypress.keycode == WKC_ESC) {
-			DeleteWindow(w);
+			w->Close();
 			return;
 		}
 		if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) {
 			if (HandleEditBoxKey(w, &WP(w, querystr_d), 10, e) == 1) /* Press Enter */
-					HandleButtonClick(w, 12);
+					w->HandleButtonClick(12);
 		}
 		break;
 	case WE_TIMEOUT:
 		/* This test protects against using widgets 11 and 12 which are only available
 		 * in those two saveload mode  */
 				/* Reset file name to current date on successfull delete */
 				if (_saveload_mode == SLD_SAVE_GAME) GenerateFileName();
 			}
 			UpdateTextBufferSize(&WP(w, querystr_d).text);
-			SetWindowDirty(w);
+			w->SetDirty();
 		} else if (IsWindowWidgetLowered(w, 12)) { /* Save button clicked */
 			_switch_mode = SM_SAVE;
 			FiosMakeSavegameName(_file_to_saveload.name, WP(w,querystr_d).text.buf, sizeof(_file_to_saveload.name));
 			/* In the editor set up the vehicle engines correctly (date might have changed) */
 	ResetObjectToPlace();
 }
 void RedrawAutosave(void)
 {
-	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
+	Window::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();
-	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
+	Window::SetDirtyById(WC_STATUS_BAR, 0);
 	return _cur_year;
 }
 typedef int32 CheckButtonClick(int32, int32);
 			} break;
 			}
 			if (value != oldvalue) {
 				WriteValue(ce->variable, ce->type, (int64)value);
-				SetWindowDirty(w);
+				w->SetDirty();
 			}
 			w->flags4 |= 5 << WF_TIMEOUT_SHL;
-			SetWindowDirty(w);
+			w->SetDirty();
 		}
 		break;
 	case WE_TIMEOUT:
 		WP(w,def_d).data_1 = 0;
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 	}
 }
 static const WindowDesc _cheats_desc = {

branch	cpp_gui
changeset 6235	5077e6ed3788
parent 6144	5a0ffbf27ced
child 6237	bce32e54c993