From 56be1cb7531e59e9b6626fae51f160aff8b5e51a Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sun, 6 Sep 2009 12:51:48 +0200
Subject: [PATCH] make Window::SetColor protected as it doesn't respect stacked
 colors

it should only be used internally by Window and derives.
---
 src/ncmpcpp.cpp |  4 ++--
 src/status.cpp  | 12 ++++++------
 src/window.h    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index ffff5b32..58021c8a 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -275,9 +275,9 @@ int main(int argc, char *argv[])
 			}
 			if (!Config.new_design)
 			{
-				wHeader->SetColor(Config.volume_color);
+				*wHeader << Config.volume_color;
 				*wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState;
-				wHeader->SetColor(Config.header_color);
+				*wHeader << clEnd;
 			}
 			wHeader->Refresh();
 			RedrawHeader = 0;
diff --git a/src/status.cpp b/src/status.cpp
index 184b636d..e1a90c31 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -335,9 +335,9 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 			case psStop:
 			{
 				WindowTitle("ncmpc++ ver. "VERSION);
-				wFooter->SetColor(Config.progressbar_color);
+				*wFooter << Config.progressbar_color;
 				mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
-				wFooter->SetColor(Config.statusbar_color);
+				*wFooter << clEnd;
 				Playlist::ReloadRemaining = 1;
 				myPlaylist->NowPlaying = -1;
 				if (Config.new_design)
@@ -497,7 +497,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 			{
 				double progressbar_size = elapsed/double(np.GetTotalLength());
 				unsigned howlong = wFooter->GetWidth()*progressbar_size;
-				wFooter->SetColor(Config.progressbar_color);
+				*wFooter << Config.progressbar_color;
 				mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
 				if (np.GetTotalLength())
 				{
@@ -506,7 +506,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 					if (howlong < wFooter->GetWidth())
 						*wFooter << Config.progressbar[1];
 				}
-				wFooter->SetColor(Config.statusbar_color);
+				*wFooter << Config.statusbar_color;
 			}
 			RedrawStatusbar = 0;
 		}
@@ -621,9 +621,9 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
 			VolumeState += IntoStr(volume);
 			VolumeState += "%";
 		}
-		wHeader->SetColor(Config.volume_color);
+		*wHeader << Config.volume_color;
 		*wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState;
-		wHeader->SetColor(Config.header_color);
+		*wHeader << clEnd;
 		wHeader->Refresh();
 	}
 	if (myScreen->ActiveWindow() == myPlaylist->Items)
diff --git a/src/window.h b/src/window.h
index 4be700ad..acc313c7 100644
--- a/src/window.h
+++ b/src/window.h
@@ -117,7 +117,6 @@ namespace NCurses
 			bool hasCoords(int &, int &);
 			
 			void SetGetStringHelper(GetStringHelper helper) { itsGetStringHelper = helper; }
-			void SetColor(Color, Color = clDefault);
 			void SetBaseColor(Color, Color = clDefault);
 			void SetBorder(Border);
 			void SetTimeout(int);
@@ -172,6 +171,7 @@ namespace NCurses
 			void Bold(bool) const;
 			void Reverse(bool) const;
 			void AltCharset(bool) const;
+			void SetColor(Color, Color = clDefault);
 			
 			void ShowBorder() const;
 			void AdjustDimensions(size_t &, size_t &);