openttd-ottdgrfs: comparison src/news

equal deleted inserted replaced

-:42bf2d268a86
+:5077e6ed3788
 static void NewsWindowProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: { /* If chatbar is open at creation time, we need to go above it */
-		const Window *w1 = FindWindowById(WC_SEND_NETWORK_MSG, 0);
+		const Window *w1 = Window::FindById(WC_SEND_NETWORK_MSG, 0);
 		w->message.msg = (w1 != NULL) ? w1->height : 0;
 	} break;
 	case WE_PAINT: {
 		const NewsItem *ni = WP(w, news_d).ni;
 	case WE_CLICK: {
 		switch (e->we.click.widget) {
 		case 1: {
 			NewsItem *ni = WP(w, news_d).ni;
-			DeleteWindow(w);
+			w->Close();
 			ni->duration = 0;
 			_forced_news = INVALID_NEWS;
 		} break;
 		case 0: {
 			NewsItem *ni = WP(w, news_d).ni;
 	case WE_KEYPRESS:
 		if (e->we.keypress.keycode == WKC_SPACE) {
 			// Don't continue.
 			e->we.keypress.cont = false;
-			DeleteWindow(w);
+			w->Close();
 		}
 		break;
 	case WE_MESSAGE: /* The chatbar has notified us that is was either created or closed */
 		switch (e->we.message.msg) {
 		ni->data_a = data_a;
 		ni->data_b = data_b;
 		ni->date = _date;
 		COPY_OUT_DPARAM(ni->params, 0, lengthof(ni->params));
-		w = FindWindowById(WC_MESSAGE_HISTORY, 0);
+		w = Window::FindById(WC_MESSAGE_HISTORY, 0);
 		if (w == NULL) return;
-		SetWindowDirty(w);
+		w->SetDirty();
 		w->vscroll.count = _total_news;
 	}
 }
 	Window *w;
 	if (_news_ticker_sound) SndPlayFx(SND_16_MORSE);
 	_statusbar_news_item = *ni;
-	w = FindWindowById(WC_STATUS_BAR, 0);
+	w = Window::FindById(WC_STATUS_BAR, 0);
 	if (w != NULL) WP(w, def_d).data_1 = 360;
 }
 // Are we ready to show another news item?
 	if (item >= MAX_NEWS) return true;
 	ni = &_news_items[item];
 	// Ticker message
 	// Check if the status bar message is still being displayed?
-	w = FindWindowById(WC_STATUS_BAR, 0);
+	w = Window::FindById(WC_STATUS_BAR, 0);
 	if (w != NULL && WP(w, const def_d).data_1 > -1280) return false;
 	// Newspaper message, decrement duration counter
 	if (ni->duration != 0) ni->duration--;
 	// neither newsticker nor newspaper are running
-	return (ni->duration == 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL);
+	return (ni->duration == 0 || Window::FindById(WC_NEWS_WINDOW, 0) == NULL);
 }
 static void MoveToNextItem(void)
 {
 	DeleteWindowById(WC_NEWS_WINDOW, 0);
 		// check the date, don't show too old items
 		if (_date - _news_items_age[ni->type] > ni->date) return;
 		switch (GetNewsDisplayValue(ni->type)) {
 		case 0: { /* Off - show nothing only a small reminder in the status bar */
-			Window *w = FindWindowById(WC_STATUS_BAR, 0);
+			Window *w = Window::FindById(WC_STATUS_BAR, 0);
 			if (w != NULL) {
 				WP(w, def_d).data_2 = 91;
-				SetWindowDirty(w);
+				w->SetDirty();
 			}
 			break;
 		}
 		case 1: /* Summary - show ticker, but if forced big, cascade to full */
 void ShowLastNewsMessage(void)
 {
 	if (_forced_news == INVALID_NEWS) {
 		/* Not forced any news yet, show the current one, unless a news window is
 		 * open (which can only be the current one), then show the previous item */
-		const Window *w = FindWindowById(WC_NEWS_WINDOW, 0);
+		const Window *w = Window::FindById(WC_NEWS_WINDOW, 0);
 		ShowNewsMessage((w == NULL || (_current_news == _oldest_news)) ? _current_news : decreaseIndex(_current_news));
 	} else if (_forced_news == _oldest_news) {
 		/* We have reached the oldest news, start anew with the latest */
 		ShowNewsMessage(_latest_news);
 	} else {
 		w->vscroll.count = _total_news;
 		w->resize.step_height = 12;
 		w->resize.height = w->height - 12 * 6; // minimum of 4 items in the list, each item 12 high
 		w->resize.step_width = 1;
 		w->resize.width = 200; // can't make window any smaller than 200 pixel
-		SetWindowDirty(w);
+		w->SetDirty();
 	}
 }
 /** Setup the disabled/enabled buttons in the message window
 * If the value is 'off' disable the [<] widget, and enable the [>] one
 				SetMessageButtonStates(w, val, element);
 				SetNewsDisplayValue(element, val);
 				WP(w, def_d).data_1 |= (1 << element);
 				w->flags4 |= 5 << WF_TIMEOUT_SHL; // XXX - setup unclick (fake widget)
-				SetWindowDirty(w);
+				w->SetDirty();
 			}
 			break;
 		case 23: case 24: /* Dropdown menu for all settings */
 			ShowDropDownMenu(w, message_opt, WP(w, def_d).data_2, 24, 0, 0);
 			break;
 				int element = (wid - 3) / 2;
 				byte val = (GetNewsDisplayValue(element) + ((wid & 1) ? -1 : 1)) % 3;
 				SetMessageButtonStates(w, val, element);
 				SetNewsDisplayValue(element, val);
-				SetWindowDirty(w);
+				w->SetDirty();
 			}
 		} break;
 		} break;
 	case WE_DROPDOWN_SELECT: {/* Select all settings for newsmessages */
 		for (i = 0; i != 10; i++) {
 			SB(_news_display_opt, i*2, 2, e->we.dropdown.index);
 			SetMessageButtonStates(w, e->we.dropdown.index, i);
 		}
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 		}
 	case WE_TIMEOUT: /* XXX - Hack to animate 'fake' buttons */
 		WP(w, def_d).data_1 = 0;
-		SetWindowDirty(w);
+		w->SetDirty();
 		break;
 	}
 }
 static const Widget _message_options_widgets[] = {
 			 * will become (change dramatized to make clear)
 			 * [---------O-----------L--]
 			 * We also need an update of the current, forced and visible (open window)
 			 * news's as this shifting could change the items they were pointing to */
 			if (_total_news != 0) {
-				w = FindWindowById(WC_NEWS_WINDOW, 0);
+				w = Window::FindById(WC_NEWS_WINDOW, 0);
 				NewsID visible_news = (w != NULL) ? (NewsID)(WP(w, news_d).ni - _news_items) : INVALID_NEWS;
 				for (NewsID i = n;; i = decreaseIndex(i)) {
 					_news_items[i] = _news_items[decreaseIndex(i)];
 			}
 			/*DEBUG(misc, 0, "-cur %3d, old %2d, lat %3d, for %3d, tot %2d",
 			  _current_news, _oldest_news, _latest_news, _forced_news, _total_news);*/
-			w = FindWindowById(WC_MESSAGE_HISTORY, 0);
+			w = Window::FindById(WC_MESSAGE_HISTORY, 0);
 			if (w != NULL) {
-				SetWindowDirty(w);
+				w->SetDirty();
 				w->vscroll.count = _total_news;
 			}
 		}
 		if (n == _latest_news) break;

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