Started moving some of the old GUI code inside /gui32

svn-id: r45185

13 files changed, 23 insertions, 22 deletions

diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 9b30e0ba41..ab754ec989 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -56,8 +56,6 @@
 			<File RelativePath="..\..\engines\sci\engine\vm_types.h" />
 		</Filter>
 		<Filter	Name="gfx">
-			<File RelativePath="..\..\engines\sci\gfx\font.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\font.h" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.h" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp" />
@@ -83,10 +81,6 @@
 			<File RelativePath="..\..\engines\sci\gfx\operations.h" />
 			<File RelativePath="..\..\engines\sci\gfx\palette.cpp" />
 			<File RelativePath="..\..\engines\sci\gfx\palette.h" />
-			<File RelativePath="..\..\engines\sci\gfx\res_font.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_view.cpp" />
 		</Filter>
 		<Filter	Name="gui">
 			<File RelativePath="..\..\engines\sci\gui\gui.cpp" />
@@ -116,6 +110,12 @@
 		<Filter Name="gui32">
 			<File RelativePath="..\..\engines\sci\gui32\gui32.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\gui32.h" />
+			<File RelativePath="..\..\engines\sci\gui32\font.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\font.h" />
+			<File RelativePath="..\..\engines\sci\gui32\res_font.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_pal.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_pic.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_view.cpp" />
 		</Filter>
 		<Filter	Name="sfx">
 			<File RelativePath="..\..\engines\sci\sfx\core.cpp" />
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 0613d5100d..c70e76c147 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -57,8 +57,6 @@
 			<File RelativePath="..\..\engines\sci\engine\vm_types.h" />
 		</Filter>
 		<Filter	Name="gfx">
-			<File RelativePath="..\..\engines\sci\gfx\font.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\font.h" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.cpp" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_driver.h" />
 			<File RelativePath="..\..\engines\sci\gfx\gfx_gui.cpp" />
@@ -84,10 +82,6 @@
 			<File RelativePath="..\..\engines\sci\gfx\operations.h" />
 			<File RelativePath="..\..\engines\sci\gfx\palette.cpp" />
 			<File RelativePath="..\..\engines\sci\gfx\palette.h" />
-			<File RelativePath="..\..\engines\sci\gfx\res_font.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
-			<File RelativePath="..\..\engines\sci\gfx\res_view.cpp" />
 		</Filter>
 		<Filter	Name="gui">
 			<File RelativePath="..\..\engines\sci\gui\gui.cpp" />
@@ -117,6 +111,12 @@
 		<Filter Name="gui32">
 			<File RelativePath="..\..\engines\sci\gui32\gui32.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\gui32.h" />
+			<File RelativePath="..\..\engines\sci\gui32\font.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\font.h" />
+			<File RelativePath="..\..\engines\sci\gui32\res_font.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_pal.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_pic.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\res_view.cpp" />
 		</Filter>
 		<Filter	Name="sfx">
 			<File RelativePath="..\..\engines\sci\sfx\core.cpp" />
diff --git a/engines/sci/gfx/gfx_gui.cpp b/engines/sci/gfx/gfx_gui.cpp
index d2137b4b4e..4e2e90bbc4 100644
--- a/engines/sci/gfx/gfx_gui.cpp
+++ b/engines/sci/gfx/gfx_gui.cpp
@@ -30,7 +30,7 @@
 #include "sci/gfx/menubar.h"
 #include "sci/gfx/gfx_gui.h"
 #include "sci/gfx/gfx_state_internal.h"
-#include "sci/gfx/font.h"
+#include "sci/gui32/font.h"
 
 #include "common/system.h"
 
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index e62e522d39..9b94ab6a4b 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -38,7 +38,7 @@
 #include "sci/gui/gui_view.h"
 #include "sci/gfx/gfx_driver.h"
 #include "sci/gfx/gfx_state_internal.h"
-#include "sci/gfx/font.h"
+#include "sci/gui32/font.h"
 
 #include "common/system.h"
 
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 06549050a7..9d212a93c3 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -27,7 +27,7 @@
 
 #include "sci/sci.h"
 #include "sci/gfx/operations.h"
-#include "sci/gfx/font.h"
+#include "sci/gui32/font.h"
 #include "sci/console.h"
 
 #include "common/system.h"
diff --git a/engines/sci/gfx/font.cpp b/engines/sci/gui32/font.cpp
index 387c41e889..5fd30b92aa 100644
--- a/engines/sci/gfx/font.cpp
+++ b/engines/sci/gui32/font.cpp
@@ -27,7 +27,7 @@
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_tools.h"
-#include "sci/gfx/font.h"
+#include "sci/gui32/font.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gfx/font.h b/engines/sci/gui32/font.h
index af7a5f19e7..b24d50fb05 100644
--- a/engines/sci/gfx/font.h
+++ b/engines/sci/gui32/font.h
@@ -143,6 +143,7 @@ bool gfxr_font_calculate_size(Common::Array<TextFragment> &fragments,
 gfx_pixmap_t *gfxr_draw_font(gfx_bitmap_font_t *font, const char *text,
 		int characters, PaletteEntry *fg0, PaletteEntry *fg1,
 		PaletteEntry *bg);
+
 /** @} */
 
 } // End of namespace Sci
diff --git a/engines/sci/gfx/picfill.cpp b/engines/sci/gui32/picfill.cpp
index f48f7e938d..f48f7e938d 100644
--- a/engines/sci/gfx/picfill.cpp
+++ b/engines/sci/gui32/picfill.cpp
diff --git a/engines/sci/gfx/res_font.cpp b/engines/sci/gui32/res_font.cpp
index 6533558388..376d911d18 100644
--- a/engines/sci/gfx/res_font.cpp
+++ b/engines/sci/gui32/res_font.cpp
@@ -27,7 +27,7 @@
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_tools.h"
-#include "sci/gfx/font.h"
+#include "sci/gui32/font.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gfx/res_pal.cpp b/engines/sci/gui32/res_pal.cpp
index d686220453..d686220453 100644
--- a/engines/sci/gfx/res_pal.cpp
+++ b/engines/sci/gui32/res_pal.cpp
diff --git a/engines/sci/gfx/res_pic.cpp b/engines/sci/gui32/res_pic.cpp
index 4ecec28011..4ecec28011 100644
--- a/engines/sci/gfx/res_pic.cpp
+++ b/engines/sci/gui32/res_pic.cpp
diff --git a/engines/sci/gfx/res_view.cpp b/engines/sci/gui32/res_view.cpp
index e4f6148fc0..e4f6148fc0 100644
--- a/engines/sci/gfx/res_view.cpp
+++ b/engines/sci/gui32/res_view.cpp
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 8c9ef94cc1..7cd2084dcb 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -35,7 +35,6 @@ MODULE_OBJS = \
 	engine/static_selectors.o \
 	engine/state.o \
 	engine/vm.o \
-	gfx/font.o \
 	gfx/gfx_driver.o \
 	gfx/gfx_gui.o \
 	gfx/gfx_pixmap_scale.o \
@@ -48,10 +47,6 @@ MODULE_OBJS = \
 	gfx/menubar.o \
 	gfx/operations.o \
 	gfx/palette.o \
-	gfx/res_font.o \
-	gfx/res_pal.o \
-	gfx/res_pic.o \
-	gfx/res_view.o \
 	gui/gui.o \
 	gui/gui_animate.o \
 	gui/gui_cursor.o \
@@ -64,6 +59,11 @@ MODULE_OBJS = \
 	gui/gui_view.o \
 	gui/gui_windowmgr.o \
 	gui32/gui32.o \
+	gui32/font.o \
+	gui32/res_font.o \
+	gui32/res_pal.o \
+	gui32/res_pic.o \
+	gui32/res_view.o \
 	sfx/core.o \
 	sfx/iterator.o \
 	sfx/songlib.o \