From c52fca1e6e3b34ece81c8951fe3e768c1a2de86a Mon Sep 17 00:00:00 2001
From: Michael Scharf <Michael.Scharf@windriver.com>
Date: Wed, 17 Oct 2007 22:33:54 +0000
Subject: [PATCH] resolved a name conflict on the mac

---
 .../tm/internal/terminal/textcanvas/VirtualCanvas.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
index 21419677174..684d5cfb33b 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
@@ -153,7 +153,7 @@ public abstract class VirtualCanvas extends Canvas {
 	 * @param gc
 	 */
 	abstract protected void paint(GC gc);
-	protected Color getBackgroundColor() {
+	protected Color getTerminalBackgroundColor() {
 //		return getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
 		return getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
 	}
@@ -164,7 +164,7 @@ public abstract class VirtualCanvas extends Canvas {
 		int marginHeight = (clipping.y+clipping.height) - height;
 		if(marginWidth>0||marginHeight>0){
 			Color bg=getBackground();
-			gc.setBackground(getBackgroundColor());
+			gc.setBackground(getTerminalBackgroundColor());
 			if (marginWidth > 0) {
 				gc.fillRectangle (width, clipping.y, marginWidth, clipping.height);
 			}