mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 02:15:31 +02:00
Code Issues Wiki Activity

fixed name conflict of the getBackgroundColor on linux

Browse source
This commit is contained in:
Michael Scharf 2011-09-15 22:26:59 +00:00
parent e643b91d23
commit 1ef96e2dbc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/test/terminalcanvas/VirtualCanvas.java
View file

@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.ScrollBar;
*/ */
public abstract class VirtualCanvas extends Canvas { public abstract class VirtualCanvas extends Canvas {
private Rectangle fVirtualBounds = new Rectangle(0,0,0,0); private final Rectangle fVirtualBounds = new Rectangle(0,0,0,0);
private Rectangle fClientArea; private Rectangle fClientArea;
private GC fPaintGC=null; private GC fPaintGC=null;
public VirtualCanvas(Composite parent, int style) { public VirtualCanvas(Composite parent, int style) {
@ -170,7 +170,7 @@ public abstract class VirtualCanvas extends Canvas {
* @param gc * @param gc
*/ */
abstract protected void paint(GC gc); abstract protected void paint(GC gc);
protected Color getBackgroundColor() { protected Color getBackgroundCanvasColor() {
return getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND); return getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
} }
protected void paintUnoccupiedSpace(GC gc, Rectangle clipping) { protected void paintUnoccupiedSpace(GC gc, Rectangle clipping) {
@ -180,7 +180,7 @@ public abstract class VirtualCanvas extends Canvas {
int marginHeight = (clipping.y+clipping.height) - height; int marginHeight = (clipping.y+clipping.height) - height;
if(marginWidth>0||marginHeight>0){ if(marginWidth>0||marginHeight>0){
Color bg=getBackground(); Color bg=getBackground();
gc.setBackground(getBackgroundColor()); gc.setBackground(getBackgroundCanvasColor());
if (marginWidth > 0) { if (marginWidth > 0) {
gc.fillRectangle (width, clipping.y, marginWidth, clipping.height); gc.fillRectangle (width, clipping.y, marginWidth, clipping.height);
} }
@ -266,7 +266,7 @@ public abstract class VirtualCanvas extends Canvas {
return y-fVirtualBounds.y; return y-fVirtualBounds.y;
} }
/** called when the viewed part is changing */ /** called when the viewed part is changing */
private Rectangle fViewRectangle=new Rectangle(0,0,0,0); private final Rectangle fViewRectangle=new Rectangle(0,0,0,0);
void updateViewRectangle() { void updateViewRectangle() {
if( if(
fViewRectangle.x==-fVirtualBounds.x fViewRectangle.x==-fVirtualBounds.x