cpp/openttd-patchpack/source Changeset - r13017:1b134b0d3a41

Changeset - r13017:1b134b0d3a41

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

frosch - 15 years ago 2009-09-13 17:37:47
frosch@openttd.org

(svn r17525) -Cleanup: Remove SetWindowDirty(), it is completely covered by other functions already.

8 files changed with 9 insertions and 21 deletions:

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

0 comments (0 inline, 0 general)

src/cheat_gui.cpp

➞

Show inline comments

@@ @@ -104,7 +104,7 @@ static int32 ClickChangeDateCheat(int32 @@
 	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;

src/console_gui.cpp

➞

Show inline comments

@@ @@ -141,7 +141,7 @@ static void IConsoleClearCommand() @@
 	_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 @@ static void IConsoleHistoryNavigate(int @@
 void IConsoleGUIPrint(ConsoleColour colour_code, char *str)
+{
 	new IConsoleLine(str, (TextColour)colour_code);
-	SetWindowDirty(FindWindowById(WC_CONSOLE, 0));
+	InvalidateWindow(WC_CONSOLE, 0);
+}

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -929,7 +929,7 @@ void CheckRedrawStationCoverage(const Wi @@
+{
 	if (_thd.dirty & 1) {
 		_thd.dirty &= ~1;
-		SetWindowDirty(w);
+		w->SetDirty();
+	}
+}
@@ @@ -2079,7 +2079,7 @@ void ShowSaveLoadDialog(SaveLoadDialogMo @@
 void RedrawAutosave()
+{
-	SetWindowDirty(FindWindowById(WC_STATUS_BAR, 0));
+	InvalidateWindow(WC_STATUS_BAR, 0);
+}
 void SetFiosType(const byte fiostype)

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -1601,14 +1601,14 @@ public: @@
 			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;

src/settings.cpp

➞

Show inline comments

@@ @@ -752,7 +752,7 @@ static bool TrainAccelerationModelChange @@
 static bool DragSignalsDensityChanged(int32)
+{
-	SetWindowDirty(FindWindowById(WC_BUILD_SIGNAL, 0));
+	InvalidateWindow(WC_BUILD_SIGNAL, 0);
 	return true;
+}

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -782,7 +782,7 @@ static void ToolbarSwitchClick(Window *w @@
 	SplitToolbar(w);
 	w->HandleButtonClick(TBN_SWITCHBAR);
-	SetWindowDirty(w);
+	w->SetDirty();
 	SndPlayFx(SND_15_BEEP);
+}

src/window.cpp

➞

Show inline comments

@@ @@ -591,16 +591,6 @@ void Window::SetDirty() const @@
 	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()
+{

src/window_func.h

➞

Show inline comments

@@ @@ -15,8 +15,6 @@ @@
 #include "window_type.h"
 #include "company_type.h"
 void SetWindowDirty(const Window *w);
 Window *FindWindowById(WindowClass cls, WindowNumber number);
 void ChangeWindowOwner(Owner old_owner, Owner new_owner);

0 comments (0 inline, 0 general)