[Scummvm-cvs-logs] CVS: scummvm/backends/wince screen.cpp,1.22,1.23

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv20638

Modified Files:
	screen.cpp 
Log Message:
Namespace fix

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/screen.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- screen.cpp	12 Oct 2003 13:49:08 -0000	1.22
+++ screen.cpp	22 Dec 2003 11:22:06 -0000	1.23
@@ -24,6 +24,7 @@
 /* Original GFX code by Vasyl Tsvirkunov */
 
 #include "wince.h"
+#include "gui/newgui.h"
 
 //#include <windows.h>
 //#include <Aygshell.h>
@@ -34,6 +35,8 @@
 
 #include <tlhelp32.h>
 
+using namespace GUI;
+
 #define COLORCONV565(r,g,b) \
 (((r&0xf8)<<(11-3))|((g&0xfc)<<(5-2))|((b&0xf8)>>3))
 #define COLORCONV555(r,g,b) \
@@ -90,7 +93,7 @@
 extern bool is_simon;
 extern bool smartphone;
 extern bool high_res;
-extern NewGui *g_gui;
+//extern NewGui *g_gui;
 bool toolbar_drawn;
 bool draw_keyboard;
 bool wide_screen;
@@ -3018,7 +3021,7 @@
 		return;
 
 	if (wide_screen && high_res) {
-		if (!g_gui->isActive()) {
+		if (!g_gui.isActive()) {
 			*px = *px * 2;
 			*py = *py * 2;
 		}
@@ -3028,7 +3031,7 @@
 	if (high_res) {
 		x = 320 - *py;
 		y = *px;
-		if (!g_gui->isActive()) {
+		if (!g_gui.isActive()) {
 			*px = x * 2;
 			*py = y * 2;
 		}