Diff: GraphicsDisplay.cpp

Revision:

2:26149011665e

Parent:

0:35a1964228b4

--- a/GraphicsDisplay.cpp	Fri Apr 19 20:46:47 2013 +0000
+++ b/GraphicsDisplay.cpp	Sun Oct 11 21:30:26 2015 +0000
@@ -110,7 +110,7 @@
     blitbit(column * 8, row * 8, 8, 8, (char*)&(FONT8x8[value - 0x1F][0]));
 }
 
-void GraphicsDisplay::window(int x, int y, int w, int h) {
+void GraphicsDisplay::gwindow(int x, int y, int w, int h) {
     // current pixel location
     _x = x;
     _y = y;
@@ -136,7 +136,7 @@
 }
 
 void GraphicsDisplay::fill(int x, int y, int w, int h, int colour) { 
-    window(x, y, w, h);
+    gwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour);
     }
@@ -147,14 +147,14 @@
 }
     
 void GraphicsDisplay::blit(int x, int y, int w, int h, const int *colour) { 
-    window(x, y, w, h);
+    gwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour[i]);
     }
 }
     
 void GraphicsDisplay::blitbit(int x, int y, int w, int h, const char* colour) {
-    window(x, y, w, h);
+    gwindow(x, y, w, h);
     for(int i = 0; i < w*h; i++) {
         char byte = colour[i >> 3];
         int offset = i & 0x7;