aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2003-11-02 02:18:16 +0000
committerMax Horn2003-11-02 02:18:16 +0000
commitb27a871f870df854a6db0f4530d4596483927bb1 (patch)
treef6c75300cd5dcd22b67044256e36a01f985a054d /backends
parentf2c4bbbdbfb06b5296eb3fcdcb7235292e6ac039 (diff)
downloadscummvm-rg350-b27a871f870df854a6db0f4530d4596483927bb1.tar.gz
scummvm-rg350-b27a871f870df854a6db0f4530d4596483927bb1.tar.bz2
scummvm-rg350-b27a871f870df854a6db0f4530d4596483927bb1.zip
turned NewGui into a singleton, and made OSystem a pseudo-singleton; added Widget::findWidget (preparing to add support for nested widgets, for the tab widget)
svn-id: r11045
Diffstat (limited to 'backends')
-rw-r--r--backends/dc/vmsave.cpp3
-rw-r--r--backends/wince/wince.cpp4
2 files changed, 1 insertions, 6 deletions
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index 9b57e583b8..a3e371e561 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -48,7 +48,6 @@ static int lastvm=-1;
static void displaySaveResult(vmsaveResult res)
{
- extern NewGui *g_gui;
char buf[1024];
switch(res) {
@@ -69,7 +68,7 @@ static void displaySaveResult(vmsaveResult res)
break;
}
- MessageDialog dialog(g_gui, buf);
+ MessageDialog dialog(buf);
dialog.runModal();
}
diff --git a/backends/wince/wince.cpp b/backends/wince/wince.cpp
index f254763222..20e86811d5 100644
--- a/backends/wince/wince.cpp
+++ b/backends/wince/wince.cpp
@@ -362,7 +362,6 @@ GameDetector detector;
Engine *engine;
bool is_simon;
bool is_bass;
-NewGui *g_gui;
extern Scumm *g_scumm;
//extern SimonEngine *g_simon;
//OSystem *g_system;
@@ -851,9 +850,6 @@ void runGame(char *game_name) {
mainClass = (OSystem_WINCE3*)system;
- //g_system = system;
- g_gui = new NewGui(system);
-
/* Start the engine */
is_simon = (strcmp(detector._plugin.getName(), "simon") == 0);