From 6f13850161c75151a24356ab94b3d25b2fe9964c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 21 Feb 2009 22:50:35 +0000
Subject: SCI: Moved include/menubar.h -> gfx/menubar.h, untangled headers some
 more

svn-id: r38761
---
 engines/sci/engine/game.cpp        | 2 ++
 engines/sci/engine/kevent.cpp      | 1 +
 engines/sci/engine/kmenu.cpp       | 1 +
 engines/sci/engine/kpathing.cpp    | 1 +
 engines/sci/engine/savegame.cfsml  | 6 +++---
 engines/sci/engine/savegame.cpp    | 6 +++---
 engines/sci/engine/scriptdebug.cpp | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'engines/sci/engine')

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 870f27829d..4fd9b0208c 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -30,6 +30,8 @@
 #include "sci/include/versions.h"
 #include "sci/include/kernel.h"
 #include "sci/engine/kernel_types.h"
+#include "sci/gfx/gfx_widgets.h"
+#include "sci/gfx/menubar.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 5723a72115..b03ef45c19 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "sci/include/engine.h"
+#include "sci/gfx/gfx_widgets.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 21374f555d..7546c8b712 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -26,6 +26,7 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/include/sci_widgets.h"
+#include "sci/gfx/menubar.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 222231e009..e61bee0391 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -30,6 +30,7 @@
 #include "sci/include/engine.h"
 #include "sci/include/aatree.h"
 #include "sci/include/list.h"
+#include "sci/gfx/gfx_widgets.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml
index a52a102c77..d977ec8eb9 100644
--- a/engines/sci/engine/savegame.cfsml
+++ b/engines/sci/engine/savegame.cfsml
@@ -29,15 +29,15 @@
 ** savegame.cfsml. If this doesn't solve your problem, contact the maintainer.
 */
 
-#include <stdarg.h>
 #include <time.h>	// FIXME: For struct tm
+#include "common/stream.h"
+#include "common/system.h"
 #include "sci/include/sci_memory.h"
 #include "sci/gfx/gfx_operations.h"
+#include "sci/gfx/menubar.h"
 #include "sci/sfx/sfx_engine.h"
 #include "sci/include/engine.h"
 #include "sci/engine/heap.h"
-#include "common/stream.h"
-#include "common/system.h"
 
 #ifdef _MSC_VER
 #include <direct.h>
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index c8ce52f141..2fd439bf4f 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -29,15 +29,15 @@
 ** savegame.cfsml. If this doesn't solve your problem, contact the maintainer.
 */
 
-#include <stdarg.h>
 #include <time.h>	// FIXME: For struct tm
+#include "common/stream.h"
+#include "common/system.h"
 #include "sci/include/sci_memory.h"
 #include "sci/gfx/gfx_operations.h"
+#include "sci/gfx/menubar.h"
 #include "sci/sfx/sfx_engine.h"
 #include "sci/include/engine.h"
 #include "sci/engine/heap.h"
-#include "common/stream.h"
-#include "common/system.h"
 
 #ifdef _MSC_VER
 #include <direct.h>
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 4760fdf286..bb6ea309d1 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -35,6 +35,7 @@
 #include "sci/include/sci_midi.h"
 #include "sci/include/sci_widgets.h"
 #include "sci/sci.h"
+#include "sci/gfx/gfx_widgets.h"
 
 #include "common/util.h"
 #include "common/savefile.h"
-- 
cgit v1.2.3