From 4ae44e1e0442b7b4af4292fa1a88e6bd9df0e97b Mon Sep 17 00:00:00 2001
From: Nicolas Bacca
Date: Mon, 22 Dec 2003 11:22:06 +0000
Subject: Namespace fix

svn-id: r11849
---
 backends/wince/screen.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'backends/wince')

diff --git a/backends/wince/screen.cpp b/backends/wince/screen.cpp
index 67cea81024..f5a2ed1cd7 100644
--- a/backends/wince/screen.cpp
+++ b/backends/wince/screen.cpp
@@ -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 hide_toolbar;
 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 @@ void Translate(int* px, int* py)
 		return;
 
 	if (wide_screen && high_res) {
-		if (!g_gui->isActive()) {
+		if (!g_gui.isActive()) {
 			*px = *px * 2;
 			*py = *py * 2;
 		}
@@ -3028,7 +3031,7 @@ void Translate(int* px, int* py)
 	if (high_res) {
 		x = 320 - *py;
 		y = *px;
-		if (!g_gui->isActive()) {
+		if (!g_gui.isActive()) {
 			*px = x * 2;
 			*py = y * 2;
 		}
-- 
cgit v1.2.3