Mercurial > hg > openttd
changeset 13027:c02d5e082def draft
(svn r17525) -Cleanup: Remove SetWindowDirty(), it is completely covered by other functions already.
author | frosch <frosch@openttd.org> |
---|---|
date | Sun, 13 Sep 2009 17:37:47 +0000 |
parents | bddedec7c8f1 |
children | 30e0feabeff8 |
files | src/cheat_gui.cpp src/console_gui.cpp src/misc_gui.cpp src/rail_gui.cpp src/settings.cpp src/toolbar_gui.cpp src/window.cpp src/window_func.h |
diffstat | 8 files changed, 9 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -104,7 +104,7 @@ SetDate(ConvertYMDToDate(_cur_year + p2, ymd.month, ymd.day)); EnginesMonthlyLoop(); - SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0)); + InvalidateWindow(WC_STATUS_BAR, 0); InvalidateWindowClassesData(WC_BUILD_STATION, 0); ResetSignalVariant(); return _cur_year;
--- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -141,7 +141,7 @@ _iconsole_cmdline.width = 0; _iconsole_cmdline.caretpos = 0; _iconsole_cmdline.caretxoffs = 0; - SetWindowDirty(FindWindowById(WC_CONSOLE, 0)); + InvalidateWindow(WC_CONSOLE, 0); } static inline void IConsoleResetHistoryPos() {_iconsole_historypos = ICON_HISTORY_SIZE - 1;} @@ -470,5 +470,5 @@ void IConsoleGUIPrint(ConsoleColour colour_code, char *str) { new IConsoleLine(str, (TextColour)colour_code); - SetWindowDirty(FindWindowById(WC_CONSOLE, 0)); + InvalidateWindow(WC_CONSOLE, 0); }
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -929,7 +929,7 @@ { if (_thd.dirty & 1) { _thd.dirty &= ~1; - SetWindowDirty(w); + w->SetDirty(); } } @@ -2079,7 +2079,7 @@ void RedrawAutosave() { - SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0)); + InvalidateWindow(WC_STATUS_BAR, 0); } void SetFiosType(const byte fiostype)
--- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1601,14 +1601,14 @@ case BSW_DRAG_SIGNALS_DENSITY_DECREASE: if (_settings_client.gui.drag_signals_density > 1) { _settings_client.gui.drag_signals_density--; - SetWindowDirty(FindWindowById(WC_GAME_OPTIONS, 0)); + InvalidateWindow(WC_GAME_OPTIONS, 0); } break; case BSW_DRAG_SIGNALS_DENSITY_INCREASE: if (_settings_client.gui.drag_signals_density < 20) { _settings_client.gui.drag_signals_density++; - SetWindowDirty(FindWindowById(WC_GAME_OPTIONS, 0)); + InvalidateWindow(WC_GAME_OPTIONS, 0); } break;
--- a/src/settings.cpp +++ b/src/settings.cpp @@ -752,7 +752,7 @@ static bool DragSignalsDensityChanged(int32) { - SetWindowDirty(FindWindowById(WC_BUILD_SIGNAL, 0)); + InvalidateWindow(WC_BUILD_SIGNAL, 0); return true; }
--- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -782,7 +782,7 @@ SplitToolbar(w); w->HandleButtonClick(TBN_SWITCHBAR); - SetWindowDirty(w); + w->SetDirty(); SndPlayFx(SND_15_BEEP); }
--- a/src/window.cpp +++ b/src/window.cpp @@ -591,16 +591,6 @@ SetDirtyBlocks(this->left, this->top, this->left + this->width, this->top + this->height); } -/** - * Mark entire window as dirty (in need of re-paint) - * @param w Window to redraw - * @ingroup dirty - */ -void SetWindowDirty(const Window *w) -{ - if (w != NULL) w->SetDirty(); -} - /** Re-initialize a window. */ void Window::ReInit() {