added prototype ListWidget (doesn't do anything yet, only serves to demo how it might look); renamed various NewGui methods and added frameRect method; made NewGui use our 'own' GUI colors (no worries if you don't like them, this is just an experiment); StaticTextWidget now clones its label (preventing problems when a game was loaded, thus invalidating string locations in memory)

svn-id: r4513

1 files changed, 7 insertions, 3 deletions

diff --git a/newgui.h b/newgui.h
index a7707abb00..7d367b6f19 100644
--- a/newgui.h
+++ b/newgui.h
@@ -26,6 +26,9 @@
 class Dialog;
 class Scumm;
 
+#define hline(x, y, x2, color) line(x, y, x2, y, color);
+#define vline(x, y, y2, color) line(x, y, x, y2, color);
+
 // Extremly simple stack class, doesn't even do any error checking (for now)
 class DialogStack {
 protected:
@@ -97,9 +100,10 @@ public:
 	byte *getBasePtr(int x, int y);
 	void box(int x, int y, int width, int height);
 	void line(int x, int y, int x2, int y2, byte color);
-	void blendArea(int x, int y, int w, int h, byte color);
-	void fillArea(int x, int y, int w, int h, byte color);
-	void setAreaDirty(int x, int y, int w, int h);
+	void blendRect(int x, int y, int w, int h, byte color);
+	void fillRect(int x, int y, int w, int h, byte color);
+	void frameRect(int x, int y, int w, int h, byte color);
+	void addDirtyRect(int x, int y, int w, int h);
 	void drawChar(const char c, int x, int y);
 	void drawString(const char *str, int x, int y, int w, byte color);