[Scummvm-git-logs] scummvm master -> 27bf39725cc608f893ca9ff87420e5542e9ff579
dreammaster
noreply at scummvm.org
Mon Feb 9 06:20:36 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
35a025e535 BAGEL: MFC: Move MFC framework into graphics/
27bf39725c BAGEL: MINIGAMES: Fix menures.h header define
Commit: 35a025e53547b2de43f19978343260aabe9dfa0d
https://github.com/scummvm/scummvm/commit/35a025e53547b2de43f19978343260aabe9dfa0d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-09T17:20:32+11:00
Commit Message:
BAGEL: MFC: Move MFC framework into graphics/
Changed paths:
A graphics/mfc/afx.cpp
A graphics/mfc/afx.h
A graphics/mfc/afxext.h
A graphics/mfc/afxmsg.h
A graphics/mfc/afxres.h
A graphics/mfc/afxstr.h
A graphics/mfc/afxwin.h
A graphics/mfc/atltime.h
A graphics/mfc/atltypes.h
A graphics/mfc/bitmap.cpp
A graphics/mfc/bitmap_button.cpp
A graphics/mfc/brush.cpp
A graphics/mfc/button.cpp
A graphics/mfc/cmd_target.cpp
A graphics/mfc/dc.cpp
A graphics/mfc/dialog.cpp
A graphics/mfc/doc_manager.cpp
A graphics/mfc/doc_template.cpp
A graphics/mfc/document.cpp
A graphics/mfc/edit.cpp
A graphics/mfc/file.cpp
A graphics/mfc/font.cpp
A graphics/mfc/frame_wnd.cpp
A graphics/mfc/gdi_object.cpp
A graphics/mfc/gfx/blitter.cpp
A graphics/mfc/gfx/blitter.h
A graphics/mfc/gfx/cursor.cpp
A graphics/mfc/gfx/cursor.h
A graphics/mfc/gfx/dialog_template.cpp
A graphics/mfc/gfx/dialog_template.h
A graphics/mfc/gfx/fonts.cpp
A graphics/mfc/gfx/fonts.h
A graphics/mfc/gfx/palette_map.cpp
A graphics/mfc/gfx/palette_map.h
A graphics/mfc/gfx/surface.cpp
A graphics/mfc/gfx/surface.h
A graphics/mfc/gfx/text_render.cpp
A graphics/mfc/gfx/text_render.h
A graphics/mfc/global_functions.cpp
A graphics/mfc/global_functions.h
A graphics/mfc/ifstream.cpp
A graphics/mfc/ifstream.h
A graphics/mfc/joystickapi.cpp
A graphics/mfc/joystickapi.h
A graphics/mfc/keyboard.h
A graphics/mfc/libs/array.h
A graphics/mfc/libs/event_loop.cpp
A graphics/mfc/libs/event_loop.h
A graphics/mfc/libs/events.cpp
A graphics/mfc/libs/events.h
A graphics/mfc/libs/list.h
A graphics/mfc/libs/resources.cpp
A graphics/mfc/libs/resources.h
A graphics/mfc/libs/settings.cpp
A graphics/mfc/libs/settings.h
A graphics/mfc/listbox.cpp
A graphics/mfc/menu.cpp
A graphics/mfc/mfc.h
A graphics/mfc/minwindef.h
A graphics/mfc/module.mk
A graphics/mfc/object.cpp
A graphics/mfc/paint_dc.cpp
A graphics/mfc/palette.cpp
A graphics/mfc/pen.cpp
A graphics/mfc/rgn.cpp
A graphics/mfc/scroll_view.cpp
A graphics/mfc/scrollbar.cpp
A graphics/mfc/single_doc_template.cpp
A graphics/mfc/static.cpp
A graphics/mfc/string.cpp
A graphics/mfc/view.cpp
A graphics/mfc/win_app.cpp
A graphics/mfc/win_hand.h
A graphics/mfc/win_thread.cpp
A graphics/mfc/wingdi.cpp
A graphics/mfc/wingdi.h
A graphics/mfc/winnt.h
A graphics/mfc/wnd.cpp
R engines/bagel/mfc/afx.cpp
R engines/bagel/mfc/afx.h
R engines/bagel/mfc/afxext.h
R engines/bagel/mfc/afxmsg.h
R engines/bagel/mfc/afxres.h
R engines/bagel/mfc/afxstr.h
R engines/bagel/mfc/afxwin.h
R engines/bagel/mfc/atltime.h
R engines/bagel/mfc/atltypes.h
R engines/bagel/mfc/bitmap.cpp
R engines/bagel/mfc/bitmap_button.cpp
R engines/bagel/mfc/brush.cpp
R engines/bagel/mfc/button.cpp
R engines/bagel/mfc/cmd_target.cpp
R engines/bagel/mfc/dc.cpp
R engines/bagel/mfc/dialog.cpp
R engines/bagel/mfc/doc_manager.cpp
R engines/bagel/mfc/doc_template.cpp
R engines/bagel/mfc/document.cpp
R engines/bagel/mfc/edit.cpp
R engines/bagel/mfc/file.cpp
R engines/bagel/mfc/font.cpp
R engines/bagel/mfc/frame_wnd.cpp
R engines/bagel/mfc/gdi_object.cpp
R engines/bagel/mfc/gfx/blitter.cpp
R engines/bagel/mfc/gfx/blitter.h
R engines/bagel/mfc/gfx/cursor.cpp
R engines/bagel/mfc/gfx/cursor.h
R engines/bagel/mfc/gfx/dialog_template.cpp
R engines/bagel/mfc/gfx/dialog_template.h
R engines/bagel/mfc/gfx/fonts.cpp
R engines/bagel/mfc/gfx/fonts.h
R engines/bagel/mfc/gfx/palette_map.cpp
R engines/bagel/mfc/gfx/palette_map.h
R engines/bagel/mfc/gfx/surface.cpp
R engines/bagel/mfc/gfx/surface.h
R engines/bagel/mfc/gfx/text_render.cpp
R engines/bagel/mfc/gfx/text_render.h
R engines/bagel/mfc/global_functions.cpp
R engines/bagel/mfc/global_functions.h
R engines/bagel/mfc/ifstream.cpp
R engines/bagel/mfc/ifstream.h
R engines/bagel/mfc/joystickapi.cpp
R engines/bagel/mfc/joystickapi.h
R engines/bagel/mfc/keyboard.h
R engines/bagel/mfc/libs/array.h
R engines/bagel/mfc/libs/event_loop.cpp
R engines/bagel/mfc/libs/event_loop.h
R engines/bagel/mfc/libs/events.cpp
R engines/bagel/mfc/libs/events.h
R engines/bagel/mfc/libs/list.h
R engines/bagel/mfc/libs/resources.cpp
R engines/bagel/mfc/libs/resources.h
R engines/bagel/mfc/libs/settings.cpp
R engines/bagel/mfc/libs/settings.h
R engines/bagel/mfc/listbox.cpp
R engines/bagel/mfc/menu.cpp
R engines/bagel/mfc/mfc.h
R engines/bagel/mfc/minwindef.h
R engines/bagel/mfc/object.cpp
R engines/bagel/mfc/paint_dc.cpp
R engines/bagel/mfc/palette.cpp
R engines/bagel/mfc/pen.cpp
R engines/bagel/mfc/rgn.cpp
R engines/bagel/mfc/scroll_view.cpp
R engines/bagel/mfc/scrollbar.cpp
R engines/bagel/mfc/single_doc_template.cpp
R engines/bagel/mfc/static.cpp
R engines/bagel/mfc/string.cpp
R engines/bagel/mfc/view.cpp
R engines/bagel/mfc/win_app.cpp
R engines/bagel/mfc/win_hand.h
R engines/bagel/mfc/win_thread.cpp
R engines/bagel/mfc/wingdi.cpp
R engines/bagel/mfc/wingdi.h
R engines/bagel/mfc/winnt.h
R engines/bagel/mfc/wnd.cpp
configure
devtools/create_project/create_project.cpp
engines/bagel/afxwin.h
engines/bagel/configure.engine
engines/bagel/hodjnpodj/hnplibs/mainmenu.h
engines/bagel/hodjnpodj/hnplibs/menures.h
engines/bagel/module.mk
diff --git a/configure b/configure
index 054d0e17edc..516fa9ae523 100755
--- a/configure
+++ b/configure
@@ -206,6 +206,7 @@ _werror_build=auto
_text_console=no
_mt32emu=yes
_lua=yes
+_mfc=no
_build_scalers=yes
_build_hq_scalers=yes
_build_edge_scalers=yes
@@ -343,6 +344,7 @@ add_component indeo3 "Indeo 3" "_indeo3" "USE_INDEO3"
add_component indeo45 "Indeo 4&5" "_indeo45" "USE_INDEO45"
add_component jyv1 "JYV1" "_jyv1" "USE_JYV1"
add_component lua "Lua" "_lua" "USE_LUA"
+add_component mfc "MFC" "_mfc" "USE_MFC"
add_component vpx "libvpx" "_vpx" "USE_VPX"
add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 038f1896b7d..f008d1163e7 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2004,6 +2004,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
+ createModuleList(setup.srcDir + "/graphics/mfc", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/gui", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/audio", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
createModuleList(setup.srcDir + "/video", setup.defines, setup.testDirs, in, ex, pchDirs, pchEx);
diff --git a/engines/bagel/afxwin.h b/engines/bagel/afxwin.h
index 4a013c44f48..affc2dbda83 100644
--- a/engines/bagel/afxwin.h
+++ b/engines/bagel/afxwin.h
@@ -22,11 +22,15 @@
#ifndef BAGEL_AFXWIN_H
#define BAGEL_AFXWIN_H
-#include "bagel/mfc/mfc.h"
+#include "graphics/mfc/mfc.h"
namespace Bagel {
-using namespace Bagel::MFC;
+using namespace Graphics::MFC;
+
+namespace MFC {
+using namespace Graphics::MFC;
+} // namespace MFC
} // namespace Bagel
diff --git a/engines/bagel/configure.engine b/engines/bagel/configure.engine
index cba8b1a335f..468c32442cb 100644
--- a/engines/bagel/configure.engine
+++ b/engines/bagel/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2" "midi"
+add_engine bagel "BAGEL" yes "" "" "16bit highres freetype2 mfc" "midi"
diff --git a/engines/bagel/hodjnpodj/hnplibs/mainmenu.h b/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
index 271b8b1e405..eedc7550a29 100644
--- a/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
+++ b/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
@@ -22,8 +22,8 @@
#ifndef HODJNPODJ_HNPLIBS_MAINMENU_H
#define HODJNPODJ_HNPLIBS_MAINMENU_H
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/afxext.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/afxext.h"
#include "bagel/hodjnpodj/hnplibs/button.h"
#include "bagel/hodjnpodj/hnplibs/dibdoc.h"
#include "bagel/hodjnpodj/hnplibs/cbofdlg.h"
diff --git a/engines/bagel/hodjnpodj/hnplibs/menures.h b/engines/bagel/hodjnpodj/hnplibs/menures.h
index 0977cfeb4b3..62bbb507c2e 100644
--- a/engines/bagel/hodjnpodj/hnplibs/menures.h
+++ b/engines/bagel/hodjnpodj/hnplibs/menures.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef BAGEL_MFC_GLOBAL_MENURES_H
-#define BAGEL_MFC_GLOBAL_MENURES_H
+#ifndef COMMON_MFC_GLOBAL_MENURES_H
+#define COMMON_MFC_GLOBAL_MENURES_H
#define IDC_OPTIONS_ARROWUP 503
#define IDC_OPTIONS_ARROWDN 504
diff --git a/engines/bagel/module.mk b/engines/bagel/module.mk
index 9b15b2222fc..05ddf74c980 100644
--- a/engines/bagel/module.mk
+++ b/engines/bagel/module.mk
@@ -17,53 +17,6 @@ MODULE_OBJS = \
boflib/sound.o \
boflib/string.o \
boflib/string_functions.o \
- mfc/afx.o \
- mfc/bitmap.o \
- mfc/bitmap_button.o \
- mfc/brush.o \
- mfc/button.o \
- mfc/cmd_target.o \
- mfc/dialog.o \
- mfc/dc.o \
- mfc/doc_manager.o \
- mfc/doc_template.o \
- mfc/document.o \
- mfc/edit.o \
- mfc/file.o \
- mfc/font.o \
- mfc/frame_wnd.o \
- mfc/gdi_object.o \
- mfc/global_functions.o \
- mfc/ifstream.o \
- mfc/joystickapi.o \
- mfc/listbox.o \
- mfc/menu.o \
- mfc/object.o \
- mfc/paint_dc.o \
- mfc/palette.o \
- mfc/pen.o \
- mfc/rgn.o \
- mfc/scroll_view.o \
- mfc/scrollbar.o \
- mfc/single_doc_template.o \
- mfc/static.o \
- mfc/string.o \
- mfc/view.o \
- mfc/win_app.o \
- mfc/win_thread.o \
- mfc/wingdi.o \
- mfc/wnd.o \
- mfc/gfx/blitter.o \
- mfc/gfx/surface.o \
- mfc/gfx/cursor.o \
- mfc/gfx/dialog_template.o \
- mfc/gfx/fonts.o \
- mfc/gfx/palette_map.o \
- mfc/gfx/text_render.o \
- mfc/libs/event_loop.o \
- mfc/libs/events.o \
- mfc/libs/resources.o \
- mfc/libs/settings.o \
spacebar/baglib/area_object.o \
spacebar/baglib/bagel.o \
spacebar/baglib/base_pda.o \
diff --git a/engines/bagel/mfc/afx.cpp b/graphics/mfc/afx.cpp
similarity index 94%
rename from engines/bagel/mfc/afx.cpp
rename to graphics/mfc/afx.cpp
index 733009a5369..5b2acde8b12 100644
--- a/engines/bagel/mfc/afx.cpp
+++ b/graphics/mfc/afx.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
CObject *CRuntimeClass::CreateObject() const {
@@ -42,4 +42,4 @@ bool CRuntimeClass::IsDerivedFrom(const CRuntimeClass *pBaseClass) const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/afx.h b/graphics/mfc/afx.h
similarity index 97%
rename from engines/bagel/mfc/afx.h
rename to graphics/mfc/afx.h
index c79b68cd4e1..72fb6dc781a 100644
--- a/engines/bagel/mfc/afx.h
+++ b/graphics/mfc/afx.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_AFX_H
-#define BAGEL_MFC_AFX_H
+#ifndef GRAPHICS_MFC_AFX_H
+#define GRAPHICS_MFC_AFX_H
#include "common/stream.h"
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
struct CRuntimeClass;
@@ -188,6 +188,6 @@ class CException {};
class CFileException : public CException {};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/afxext.h b/graphics/mfc/afxext.h
similarity index 90%
rename from engines/bagel/mfc/afxext.h
rename to graphics/mfc/afxext.h
index 645ad7a1f51..a47ba6ba491 100644
--- a/engines/bagel/mfc/afxext.h
+++ b/graphics/mfc/afxext.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_AFXEXT_H
-#define BAGEL_MFC_AFXEXT_H
+#ifndef GRAPHICS_MFC_AFXEXT_H
+#define GRAPHICS_MFC_AFXEXT_H
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CBitmapButton : public CButton {
@@ -47,6 +47,6 @@ public:
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/afxmsg.h b/graphics/mfc/afxmsg.h
similarity index 99%
rename from engines/bagel/mfc/afxmsg.h
rename to graphics/mfc/afxmsg.h
index cad317d7e13..28f3e2206df 100644
--- a/engines/bagel/mfc/afxmsg.h
+++ b/graphics/mfc/afxmsg.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_AFXMSG_H
-#define BAGEL_MFC_AFXMSG_H
+#ifndef GRAPHICS_MFC_AFXMSG_H
+#define GRAPHICS_MFC_AFXMSG_H
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
@@ -1378,6 +1378,6 @@ namespace MFC {
(memberFxn)) },
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/afxres.h b/graphics/mfc/afxres.h
similarity index 98%
rename from engines/bagel/mfc/afxres.h
rename to graphics/mfc/afxres.h
index 8a982046e41..287cb71df81 100644
--- a/engines/bagel/mfc/afxres.h
+++ b/graphics/mfc/afxres.h
@@ -19,10 +19,10 @@
*
*/
-#ifndef BAGEL_MFC_AFXRES_H
-#define BAGEL_MFC_AFXRES_H
+#ifndef GRAPHICS_MFC_AFXRES_H
+#define GRAPHICS_MFC_AFXRES_H
-namespace Bagel {
+namespace Graphics {
namespace MFC {
/////////////////////////////////////////////////////////////////////////////
@@ -131,6 +131,6 @@ namespace MFC {
#define ID_OLE_VERB_POPUP 0xE220
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/afxstr.h b/graphics/mfc/afxstr.h
similarity index 94%
rename from engines/bagel/mfc/afxstr.h
rename to graphics/mfc/afxstr.h
index cb39fb1deef..fbc80ff10c9 100644
--- a/engines/bagel/mfc/afxstr.h
+++ b/graphics/mfc/afxstr.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_AFXSTR_H
-#define BAGEL_MFC_AFXSTR_H
+#ifndef GRAPHICS_MFC_AFXSTR_H
+#define GRAPHICS_MFC_AFXSTR_H
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
#include "common/str.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CString : public Common::String {
@@ -111,6 +111,6 @@ inline CString operator+(char x, const CString &y) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/afxwin.h b/graphics/mfc/afxwin.h
similarity index 98%
rename from engines/bagel/mfc/afxwin.h
rename to graphics/mfc/afxwin.h
index 242c2fee9d7..c04f4e28437 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/graphics/mfc/afxwin.h
@@ -19,32 +19,32 @@
*
*/
-#ifndef BAGEL_MFC_AFXWIN_H
-#define BAGEL_MFC_AFXWIN_H
+#ifndef GRAPHICS_MFC_AFXWIN_H
+#define GRAPHICS_MFC_AFXWIN_H
#include "common/events.h"
#include "common/fs.h"
#include "graphics/palette.h"
#include "graphics/screen.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/wingdi.h"
-#include "bagel/mfc/afx.h"
-#include "bagel/mfc/afxmsg.h"
-#include "bagel/mfc/afxstr.h"
-#include "bagel/mfc/atltypes.h"
-#include "bagel/mfc/global_functions.h"
-#include "bagel/mfc/gfx/surface.h"
-#include "bagel/mfc/gfx/cursor.h"
-#include "bagel/mfc/gfx/dialog_template.h"
-#include "bagel/mfc/gfx/fonts.h"
-#include "bagel/mfc/gfx/text_render.h"
-#include "bagel/mfc/libs/array.h"
-#include "bagel/mfc/libs/event_loop.h"
-#include "bagel/mfc/libs/events.h"
-#include "bagel/mfc/libs/list.h"
-#include "bagel/mfc/libs/settings.h"
-
-namespace Bagel {
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/wingdi.h"
+#include "graphics/mfc/afx.h"
+#include "graphics/mfc/afxmsg.h"
+#include "graphics/mfc/afxstr.h"
+#include "graphics/mfc/atltypes.h"
+#include "graphics/mfc/global_functions.h"
+#include "graphics/mfc/gfx/surface.h"
+#include "graphics/mfc/gfx/cursor.h"
+#include "graphics/mfc/gfx/dialog_template.h"
+#include "graphics/mfc/gfx/fonts.h"
+#include "graphics/mfc/gfx/text_render.h"
+#include "graphics/mfc/libs/array.h"
+#include "graphics/mfc/libs/event_loop.h"
+#include "graphics/mfc/libs/events.h"
+#include "graphics/mfc/libs/list.h"
+#include "graphics/mfc/libs/settings.h"
+
+namespace Graphics {
namespace MFC {
constexpr uint32 DEFAULT_MODAL_RESULT = MKTAG('S', 'C', 'V', 'M');
@@ -2121,6 +2121,6 @@ public:
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/atltime.h b/graphics/mfc/atltime.h
similarity index 96%
rename from engines/bagel/mfc/atltime.h
rename to graphics/mfc/atltime.h
index 5b7dadd6979..867cd3d9974 100644
--- a/engines/bagel/mfc/atltime.h
+++ b/graphics/mfc/atltime.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_ATLTIME_H
-#define BAGEL_MFC_ATLTIME_H
+#ifndef GRAPHICS_MFC_ATLTIME_H
+#define GRAPHICS_MFC_ATLTIME_H
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/afxstr.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/afxstr.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
typedef long clock_t;
@@ -198,6 +198,6 @@ public:
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/atltypes.h b/graphics/mfc/atltypes.h
similarity index 99%
rename from engines/bagel/mfc/atltypes.h
rename to graphics/mfc/atltypes.h
index 3405381cf1a..7e43e7916c8 100644
--- a/engines/bagel/mfc/atltypes.h
+++ b/graphics/mfc/atltypes.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_ATLTYPES_H
-#define BAGEL_MFC_ATLTYPES_H
+#ifndef GRAPHICS_MFC_ATLTYPES_H
+#define GRAPHICS_MFC_ATLTYPES_H
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
/////////////////////////////////////////////////////////////////////////////
@@ -932,6 +932,6 @@ inline CRect CRect::MulDiv(
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/bitmap.cpp b/graphics/mfc/bitmap.cpp
similarity index 97%
rename from engines/bagel/mfc/bitmap.cpp
rename to graphics/mfc/bitmap.cpp
index ddc11b06be6..b46019c19c9 100644
--- a/engines/bagel/mfc/bitmap.cpp
+++ b/graphics/mfc/bitmap.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
bool CBitmap::Attach(HBITMAP hObject) {
@@ -110,4 +110,4 @@ long CBitmap::GetBitmapBits(long dwCount, void *lpBits) const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/bitmap_button.cpp b/graphics/mfc/bitmap_button.cpp
similarity index 93%
rename from engines/bagel/mfc/bitmap_button.cpp
rename to graphics/mfc/bitmap_button.cpp
index 9bae617c7b5..61d1ce87eff 100644
--- a/engines/bagel/mfc/bitmap_button.cpp
+++ b/graphics/mfc/bitmap_button.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxext.h"
+#include "graphics/mfc/afxext.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CBitmapButton, CButton)
@@ -34,4 +34,4 @@ void CBitmapButton::SizeToContent() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/brush.cpp b/graphics/mfc/brush.cpp
similarity index 96%
rename from engines/bagel/mfc/brush.cpp
rename to graphics/mfc/brush.cpp
index 6771e4b103e..f2546d5ae3e 100644
--- a/engines/bagel/mfc/brush.cpp
+++ b/graphics/mfc/brush.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
CBrush::CBrush() {
@@ -105,4 +105,4 @@ byte CBrush::Impl::getColor() const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/button.cpp b/graphics/mfc/button.cpp
similarity index 98%
rename from engines/bagel/mfc/button.cpp
rename to graphics/mfc/button.cpp
index 57e018764b1..c7254fa27bb 100644
--- a/engines/bagel/mfc/button.cpp
+++ b/graphics/mfc/button.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CButton, CWnd)
@@ -283,4 +283,4 @@ LRESULT CButton::OnBnSetCheck(WPARAM wParam, LPARAM lParam) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/cmd_target.cpp b/graphics/mfc/cmd_target.cpp
similarity index 98%
rename from engines/bagel/mfc/cmd_target.cpp
rename to graphics/mfc/cmd_target.cpp
index 1f8917c020a..f3b7bb742f3 100644
--- a/engines/bagel/mfc/cmd_target.cpp
+++ b/graphics/mfc/cmd_target.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CCmdTarget, CObject)
@@ -230,4 +230,4 @@ bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, unsigned int nID, int n
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/dc.cpp b/graphics/mfc/dc.cpp
similarity index 99%
rename from engines/bagel/mfc/dc.cpp
rename to graphics/mfc/dc.cpp
index a84a754a3f5..aac95f99080 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/graphics/mfc/dc.cpp
@@ -21,11 +21,11 @@
#include "common/system.h"
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/win_hand.h"
-#include "bagel/mfc/gfx/blitter.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/win_hand.h"
+#include "graphics/mfc/gfx/blitter.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNCREATE(CDC, CObject)
@@ -1385,4 +1385,4 @@ bool CDC::Impl::getTextMetrics(LPTEXTMETRIC lpMetrics) const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/dialog.cpp b/graphics/mfc/dialog.cpp
similarity index 98%
rename from engines/bagel/mfc/dialog.cpp
rename to graphics/mfc/dialog.cpp
index a974e6b3613..1bb8b5640da 100644
--- a/engines/bagel/mfc/dialog.cpp
+++ b/graphics/mfc/dialog.cpp
@@ -20,10 +20,10 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/keyboard.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/keyboard.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CDialog, CWnd)
@@ -425,4 +425,4 @@ void CDialog::sendButtonClicked(CButton *btn) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/doc_manager.cpp b/graphics/mfc/doc_manager.cpp
similarity index 96%
rename from engines/bagel/mfc/doc_manager.cpp
rename to graphics/mfc/doc_manager.cpp
index 1767f2e710c..eee09f40bf8 100644
--- a/engines/bagel/mfc/doc_manager.cpp
+++ b/graphics/mfc/doc_manager.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
void CDocManager::AddDocTemplate(CDocTemplate *pTemplate) {
@@ -66,4 +66,4 @@ void CDocManager::CloseAllDocuments(bool bEndSession) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/doc_template.cpp b/graphics/mfc/doc_template.cpp
similarity index 97%
rename from engines/bagel/mfc/doc_template.cpp
rename to graphics/mfc/doc_template.cpp
index fb183da35d9..52cfe198e19 100644
--- a/engines/bagel/mfc/doc_template.cpp
+++ b/graphics/mfc/doc_template.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CDocTemplate, CCmdTarget)
@@ -125,4 +125,4 @@ void CDocTemplate::CloseAllDocuments(bool) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/document.cpp b/graphics/mfc/document.cpp
similarity index 98%
rename from engines/bagel/mfc/document.cpp
rename to graphics/mfc/document.cpp
index 29925c0e738..11625349e78 100644
--- a/engines/bagel/mfc/document.cpp
+++ b/graphics/mfc/document.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
@@ -167,4 +167,4 @@ void CDocument::OnChangedViewList() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/edit.cpp b/graphics/mfc/edit.cpp
similarity index 98%
rename from engines/bagel/mfc/edit.cpp
rename to graphics/mfc/edit.cpp
index 1c124849785..c0f25f71052 100644
--- a/engines/bagel/mfc/edit.cpp
+++ b/graphics/mfc/edit.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
#define TIMER_ID 1
@@ -152,4 +152,4 @@ unsigned int CEdit::OnGetDlgCode() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/file.cpp b/graphics/mfc/file.cpp
similarity index 97%
rename from engines/bagel/mfc/file.cpp
rename to graphics/mfc/file.cpp
index 62c7f7ba270..72ead92726a 100644
--- a/engines/bagel/mfc/file.cpp
+++ b/graphics/mfc/file.cpp
@@ -21,9 +21,9 @@
#include "common/file.h"
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CFile, CObject)
@@ -102,4 +102,4 @@ Common::SeekableReadStream *CFile::detach() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/font.cpp b/graphics/mfc/font.cpp
similarity index 95%
rename from engines/bagel/mfc/font.cpp
rename to graphics/mfc/font.cpp
index 4dbb804ab25..c4223e83453 100644
--- a/engines/bagel/mfc/font.cpp
+++ b/graphics/mfc/font.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
bool CFont::CreateFont(int nHeight, int nWidth, int nEscapement,
@@ -56,4 +56,4 @@ bool CFont::CreateFontIndirect(const LOGFONT *lpLogFont) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/frame_wnd.cpp b/graphics/mfc/frame_wnd.cpp
similarity index 98%
rename from engines/bagel/mfc/frame_wnd.cpp
rename to graphics/mfc/frame_wnd.cpp
index 12e1304c9ba..6edba266e2b 100644
--- a/engines/bagel/mfc/frame_wnd.cpp
+++ b/graphics/mfc/frame_wnd.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CFrameWnd, CWnd)
@@ -252,4 +252,4 @@ void CFrameWnd::OnActivate(unsigned int nState, CWnd *pWndOther, bool bMinimized
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gdi_object.cpp b/graphics/mfc/gdi_object.cpp
similarity index 95%
rename from engines/bagel/mfc/gdi_object.cpp
rename to graphics/mfc/gdi_object.cpp
index 8c98b7d4981..3bd71147959 100644
--- a/engines/bagel/mfc/gdi_object.cpp
+++ b/graphics/mfc/gdi_object.cpp
@@ -20,10 +20,10 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/win_hand.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/win_hand.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNCREATE(CGdiObject, CObject)
@@ -94,4 +94,4 @@ void CGdiObject::AfxUnhookObject() {
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/blitter.cpp b/graphics/mfc/gfx/blitter.cpp
similarity index 98%
rename from engines/bagel/mfc/gfx/blitter.cpp
rename to graphics/mfc/gfx/blitter.cpp
index a197c102920..34f8c7258cf 100644
--- a/engines/bagel/mfc/gfx/blitter.cpp
+++ b/graphics/mfc/gfx/blitter.cpp
@@ -20,10 +20,10 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/gfx/blitter.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/gfx/blitter.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -226,4 +226,4 @@ void frameRect(Gfx::Surface *dest,
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/blitter.h b/graphics/mfc/gfx/blitter.h
similarity index 90%
rename from engines/bagel/mfc/gfx/blitter.h
rename to graphics/mfc/gfx/blitter.h
index 3cf326544c8..3e2388c491c 100644
--- a/engines/bagel/mfc/gfx/blitter.h
+++ b/graphics/mfc/gfx/blitter.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_GFX_BLITTER_H
-#define BAGEL_MFC_GFX_BLITTER_H
+#ifndef GRAPHICS_MFC_GFX_BLITTER_H
+#define GRAPHICS_MFC_GFX_BLITTER_H
-#include "bagel/mfc/gfx/surface.h"
+#include "graphics/mfc/gfx/surface.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -41,6 +41,6 @@ extern void frameRect(Gfx::Surface *dest,
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/cursor.cpp b/graphics/mfc/gfx/cursor.cpp
similarity index 97%
rename from engines/bagel/mfc/gfx/cursor.cpp
rename to graphics/mfc/gfx/cursor.cpp
index 91bb4f1e664..0414ca02983 100644
--- a/engines/bagel/mfc/gfx/cursor.cpp
+++ b/graphics/mfc/gfx/cursor.cpp
@@ -22,10 +22,10 @@
#include "graphics/cursorman.h"
#include "graphics/wincursor.h"
#include "image/bmp.h"
-#include "bagel/mfc/gfx/cursor.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/gfx/cursor.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -183,4 +183,4 @@ void Cursor::hide() {
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/cursor.h b/graphics/mfc/gfx/cursor.h
similarity index 92%
rename from engines/bagel/mfc/gfx/cursor.h
rename to graphics/mfc/gfx/cursor.h
index 02e920f3640..9661f69d38e 100644
--- a/engines/bagel/mfc/gfx/cursor.h
+++ b/graphics/mfc/gfx/cursor.h
@@ -19,18 +19,18 @@
*
*/
-#ifndef BAGEL_MFC_GFX_CURSOR_H
-#define BAGEL_MFC_GFX_CURSOR_H
+#ifndef GRAPHICS_MFC_GFX_CURSOR_H
+#define GRAPHICS_MFC_GFX_CURSOR_H
#include "common/hash-str.h"
#include "common/path.h"
#include "common/formats/winexe_ne.h"
#include "graphics/managed_surface.h"
#include "graphics/wincursor.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/libs/resources.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/libs/resources.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -103,6 +103,6 @@ public:
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/dialog_template.cpp b/graphics/mfc/gfx/dialog_template.cpp
similarity index 98%
rename from engines/bagel/mfc/gfx/dialog_template.cpp
rename to graphics/mfc/gfx/dialog_template.cpp
index 6222aa48c03..4f388a9708e 100644
--- a/engines/bagel/mfc/gfx/dialog_template.cpp
+++ b/graphics/mfc/gfx/dialog_template.cpp
@@ -20,10 +20,10 @@
*/
#include "common/memstream.h"
-#include "bagel/mfc/gfx/dialog_template.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/gfx/dialog_template.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -273,4 +273,4 @@ void CDialogTemplate::loadTemplate(CDialog *dialog) {
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/graphics/mfc/gfx/dialog_template.h
similarity index 94%
rename from engines/bagel/mfc/gfx/dialog_template.h
rename to graphics/mfc/gfx/dialog_template.h
index ca6c0a4c935..30280a3e581 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/graphics/mfc/gfx/dialog_template.h
@@ -19,16 +19,16 @@
*
*/
-#ifndef BAGEL_MFC_GFX_DIALOG_TEMPLATE_H
-#define BAGEL_MFC_GFX_DIALOG_TEMPLATE_H
+#ifndef GRAPHICS_MFC_GFX_DIALOG_TEMPLATE_H
+#define GRAPHICS_MFC_GFX_DIALOG_TEMPLATE_H
#include "common/array.h"
#include "common/stream.h"
#include "graphics/managed_surface.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/afxstr.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/afxstr.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CDialog;
@@ -133,6 +133,6 @@ using Gfx::LPCDLGTEMPLATE;
using Gfx::CDialogTemplate;
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/fonts.cpp b/graphics/mfc/gfx/fonts.cpp
similarity index 98%
rename from engines/bagel/mfc/gfx/fonts.cpp
rename to graphics/mfc/gfx/fonts.cpp
index 98261b27ea8..b5085610bdd 100644
--- a/engines/bagel/mfc/gfx/fonts.cpp
+++ b/graphics/mfc/gfx/fonts.cpp
@@ -20,10 +20,10 @@
*/
#include "graphics/fonts/winfont.h"
-#include "bagel/mfc/gfx/fonts.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/gfx/fonts.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -230,4 +230,4 @@ void Font::drawChar(Graphics::ManagedSurface *dst, uint32 chr, int x, int y, uin
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/fonts.h b/graphics/mfc/gfx/fonts.h
similarity index 94%
rename from engines/bagel/mfc/gfx/fonts.h
rename to graphics/mfc/gfx/fonts.h
index 45cca3cf306..0911a7c9a31 100644
--- a/engines/bagel/mfc/gfx/fonts.h
+++ b/graphics/mfc/gfx/fonts.h
@@ -19,16 +19,16 @@
*
*/
-#ifndef BAGEL_MFC_GFX_FONTS_H
-#define BAGEL_MFC_GFX_FONTS_H
+#ifndef GRAPHICS_MFC_GFX_FONTS_H
+#define GRAPHICS_MFC_GFX_FONTS_H
#include "common/array.h"
#include "common/types.h"
#include "graphics/font.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/libs/resources.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/libs/resources.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -127,6 +127,6 @@ public:
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/palette_map.cpp b/graphics/mfc/gfx/palette_map.cpp
similarity index 95%
rename from engines/bagel/mfc/gfx/palette_map.cpp
rename to graphics/mfc/gfx/palette_map.cpp
index 05ec6a88eeb..a01f5b85da8 100644
--- a/engines/bagel/mfc/gfx/palette_map.cpp
+++ b/graphics/mfc/gfx/palette_map.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "bagel/mfc/gfx/palette_map.h"
+#include "graphics/mfc/gfx/palette_map.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -67,4 +67,4 @@ void PaletteMap::map(const byte *src, byte *dest, size_t len) {
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/palette_map.h b/graphics/mfc/gfx/palette_map.h
similarity index 91%
rename from engines/bagel/mfc/gfx/palette_map.h
rename to graphics/mfc/gfx/palette_map.h
index e7c5944e462..851f453577f 100644
--- a/engines/bagel/mfc/gfx/palette_map.h
+++ b/graphics/mfc/gfx/palette_map.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_GFX_PALETTE_MAP_H
-#define BAGEL_MFC_GFX_PALETTE_MAP_H
+#ifndef GRAPHICS_MFC_GFX_PALETTE_MAP_H
+#define GRAPHICS_MFC_GFX_PALETTE_MAP_H
#include "graphics/palette.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -46,6 +46,6 @@ public:
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/surface.cpp b/graphics/mfc/gfx/surface.cpp
similarity index 98%
rename from engines/bagel/mfc/gfx/surface.cpp
rename to graphics/mfc/gfx/surface.cpp
index 302cb3b3286..1bfb7c291f6 100644
--- a/engines/bagel/mfc/gfx/surface.cpp
+++ b/graphics/mfc/gfx/surface.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "bagel/mfc/gfx/surface.h"
+#include "graphics/mfc/gfx/surface.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -246,4 +246,4 @@ Graphics::ManagedSurface Surface::getSubArea(const Common::Rect &r) {
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/surface.h b/graphics/mfc/gfx/surface.h
similarity index 95%
rename from engines/bagel/mfc/gfx/surface.h
rename to graphics/mfc/gfx/surface.h
index f0d98734197..ecd145cda71 100644
--- a/engines/bagel/mfc/gfx/surface.h
+++ b/graphics/mfc/gfx/surface.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_GFX_SURFACE_H
-#define BAGEL_MFC_GFX_SURFACE_H
+#ifndef GRAPHICS_MFC_GFX_SURFACE_H
+#define GRAPHICS_MFC_GFX_SURFACE_H
#include "graphics/managed_surface.h"
-#include "bagel/mfc/atltypes.h"
+#include "graphics/mfc/atltypes.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -125,6 +125,6 @@ public:
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/gfx/text_render.cpp b/graphics/mfc/gfx/text_render.cpp
similarity index 97%
rename from engines/bagel/mfc/gfx/text_render.cpp
rename to graphics/mfc/gfx/text_render.cpp
index c1a7451c7ba..13cfde20fb8 100644
--- a/engines/bagel/mfc/gfx/text_render.cpp
+++ b/graphics/mfc/gfx/text_render.cpp
@@ -19,10 +19,10 @@
*
*/
-#include "bagel/mfc/gfx/text_render.h"
-#include "bagel/mfc/wingdi.h"
+#include "graphics/mfc/gfx/text_render.h"
+#include "graphics/mfc/wingdi.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -158,4 +158,4 @@ void TextRender::wordWrapText(Graphics::Font *font, const Common::String &str,
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/gfx/text_render.h b/graphics/mfc/gfx/text_render.h
similarity index 85%
rename from engines/bagel/mfc/gfx/text_render.h
rename to graphics/mfc/gfx/text_render.h
index 39bec9cee62..55ba3878ebd 100644
--- a/engines/bagel/mfc/gfx/text_render.h
+++ b/graphics/mfc/gfx/text_render.h
@@ -19,17 +19,17 @@
*
*/
-#ifndef BAGEL_MFC_GFX_TEXT_RENDER_H
-#define BAGEL_MFC_GFX_TEXT_RENDER_H
+#ifndef GRAPHICS_MFC_GFX_TEXT_RENDER_H
+#define GRAPHICS_MFC_GFX_TEXT_RENDER_H
#include "common/str-array.h"
#include "graphics/font.h"
-#include "bagel/mfc/gfx/surface.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/atltypes.h"
-#include "bagel/mfc/wingdi.h"
+#include "graphics/mfc/gfx/surface.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/atltypes.h"
+#include "graphics/mfc/wingdi.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Gfx {
@@ -50,6 +50,6 @@ protected:
} // namespace Gfx
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/global_functions.cpp b/graphics/mfc/global_functions.cpp
similarity index 98%
rename from engines/bagel/mfc/global_functions.cpp
rename to graphics/mfc/global_functions.cpp
index 05ad4c76dca..23f84e7bd5b 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/graphics/mfc/global_functions.cpp
@@ -22,10 +22,10 @@
#include "common/file.h"
#include "common/system.h"
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/global_functions.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/global_functions.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
struct MemBlock {
@@ -281,4 +281,4 @@ bool AfxExtractSubString(CString &rString, const char *lpszFullString,
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/global_functions.h b/graphics/mfc/global_functions.h
similarity index 96%
rename from engines/bagel/mfc/global_functions.h
rename to graphics/mfc/global_functions.h
index 9a49d525cf9..81e5e5832be 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/graphics/mfc/global_functions.h
@@ -19,15 +19,15 @@
*
*/
-#ifndef BAGEL_MFC_GLOBAL_FUNCTIONS_H
-#define BAGEL_MFC_GLOBAL_FUNCTIONS_H
+#ifndef GRAPHICS_MFC_GLOBAL_FUNCTIONS_H
+#define GRAPHICS_MFC_GLOBAL_FUNCTIONS_H
#include "common/stream.h"
-#include "bagel/mfc/afxstr.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/winnt.h"
+#include "graphics/mfc/afxstr.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/winnt.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CWinApp;
@@ -158,6 +158,6 @@ inline char *strLower(char *s) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/ifstream.cpp b/graphics/mfc/ifstream.cpp
similarity index 94%
rename from engines/bagel/mfc/ifstream.cpp
rename to graphics/mfc/ifstream.cpp
index 44b3cc7e575..1c7467863ef 100644
--- a/engines/bagel/mfc/ifstream.cpp
+++ b/graphics/mfc/ifstream.cpp
@@ -20,10 +20,10 @@
*/
#include "common/file.h"
-#include "bagel/mfc/ifstream.h"
-#include "bagel/mfc/global_functions.h"
+#include "graphics/mfc/ifstream.h"
+#include "graphics/mfc/global_functions.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
ifstream::ifstream() {
@@ -111,4 +111,4 @@ ifstream &ifstream::seekg(int32 off, int dir) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/ifstream.h b/graphics/mfc/ifstream.h
similarity index 94%
rename from engines/bagel/mfc/ifstream.h
rename to graphics/mfc/ifstream.h
index 8078d9a1372..7c40d813a57 100644
--- a/engines/bagel/mfc/ifstream.h
+++ b/graphics/mfc/ifstream.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_IFSTREAM_H
-#define BAGEL_MFC_IFSTREAM_H
+#ifndef GRAPHICS_MFC_IFSTREAM_H
+#define GRAPHICS_MFC_IFSTREAM_H
#include "common/file.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace ios {
@@ -66,6 +66,6 @@ public:
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/joystickapi.cpp b/graphics/mfc/joystickapi.cpp
similarity index 92%
rename from engines/bagel/mfc/joystickapi.cpp
rename to graphics/mfc/joystickapi.cpp
index b91e168f150..7fa236f2e97 100644
--- a/engines/bagel/mfc/joystickapi.cpp
+++ b/graphics/mfc/joystickapi.cpp
@@ -20,10 +20,10 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/joystickapi.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/joystickapi.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
MMRESULT joySetCapture(HWND hwnd, unsigned int uJoyID,
@@ -44,4 +44,4 @@ MMRESULT joyReleaseCapture(unsigned int uJoyID) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/joystickapi.h b/graphics/mfc/joystickapi.h
similarity index 92%
rename from engines/bagel/mfc/joystickapi.h
rename to graphics/mfc/joystickapi.h
index db35b83dcca..48c6173af5e 100644
--- a/engines/bagel/mfc/joystickapi.h
+++ b/graphics/mfc/joystickapi.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_JOYSTICKAPI_H
-#define BAGEL_MFC_JOYSTICKAPI_H
+#ifndef GRAPHICS_MFC_JOYSTICKAPI_H
+#define GRAPHICS_MFC_JOYSTICKAPI_H
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/winnt.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/winnt.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
typedef int MMRESULT;
@@ -65,6 +65,6 @@ extern MMRESULT joyGetPos(unsigned int uJoyID, LPJOYINFO pji);
extern MMRESULT joyReleaseCapture(unsigned int uJoyID);
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/keyboard.h b/graphics/mfc/keyboard.h
similarity index 94%
rename from engines/bagel/mfc/keyboard.h
rename to graphics/mfc/keyboard.h
index e80cdc31298..f444191eb24 100644
--- a/engines/bagel/mfc/keyboard.h
+++ b/graphics/mfc/keyboard.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_KEYBOARD_H
-#define BAGEL_MFC_KEYBOARD_H
+#ifndef GRAPHICS_MFC_KEYBOARD_H
+#define GRAPHICS_MFC_KEYBOARD_H
#include "common/events.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
enum {
@@ -58,6 +58,6 @@ enum {
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/array.h b/graphics/mfc/libs/array.h
similarity index 94%
rename from engines/bagel/mfc/libs/array.h
rename to graphics/mfc/libs/array.h
index 5c3178c7f8b..690c60bbcce 100644
--- a/engines/bagel/mfc/libs/array.h
+++ b/graphics/mfc/libs/array.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_ARRAY_H
-#define BAGEL_MFC_LIBS_ARRAY_H
+#ifndef GRAPHICS_MFC_LIBS_ARRAY_H
+#define GRAPHICS_MFC_LIBS_ARRAY_H
#include "common/array.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -69,6 +69,6 @@ public:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/event_loop.cpp b/graphics/mfc/libs/event_loop.cpp
similarity index 98%
rename from engines/bagel/mfc/libs/event_loop.cpp
rename to graphics/mfc/libs/event_loop.cpp
index b92646c5811..4f69cfa29d4 100644
--- a/engines/bagel/mfc/libs/event_loop.cpp
+++ b/graphics/mfc/libs/event_loop.cpp
@@ -21,11 +21,11 @@
#include "common/system.h"
#include "engines/engine.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/libs/event_loop.h"
-#include "bagel/mfc/winnt.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/libs/event_loop.h"
+#include "graphics/mfc/winnt.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -548,4 +548,4 @@ bool EventLoop::isChar(Common::KeyCode kc) const {
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/libs/event_loop.h b/graphics/mfc/libs/event_loop.h
similarity index 96%
rename from engines/bagel/mfc/libs/event_loop.h
rename to graphics/mfc/libs/event_loop.h
index d91778b354d..2434f6cb01d 100644
--- a/engines/bagel/mfc/libs/event_loop.h
+++ b/graphics/mfc/libs/event_loop.h
@@ -19,17 +19,17 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_EVENT_LOOP_H
-#define BAGEL_MFC_LIBS_EVENT_LOOP_H
+#ifndef GRAPHICS_MFC_LIBS_EVENT_LOOP_H
+#define GRAPHICS_MFC_LIBS_EVENT_LOOP_H
#include "common/events.h"
#include "common/list.h"
#include "common/stack.h"
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/libs/events.h"
-#include "bagel/mfc/joystickapi.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/libs/events.h"
+#include "graphics/mfc/joystickapi.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -265,6 +265,6 @@ public:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/events.cpp b/graphics/mfc/libs/events.cpp
similarity index 97%
rename from engines/bagel/mfc/libs/events.cpp
rename to graphics/mfc/libs/events.cpp
index 9ffd716425a..3960ae1e596 100644
--- a/engines/bagel/mfc/libs/events.cpp
+++ b/graphics/mfc/libs/events.cpp
@@ -20,10 +20,10 @@
*/
#include "common/system.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/libs/events.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/libs/events.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -187,4 +187,4 @@ bool EventQueue::peekMessage(MSG *lpMsg, HWND hWnd,
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/libs/events.h b/graphics/mfc/libs/events.h
similarity index 91%
rename from engines/bagel/mfc/libs/events.h
rename to graphics/mfc/libs/events.h
index bbe7b0aae2d..e57567c9c20 100644
--- a/engines/bagel/mfc/libs/events.h
+++ b/graphics/mfc/libs/events.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_EVENTS_H
-#define BAGEL_MFC_LIBS_EVENTS_H
+#ifndef GRAPHICS_MFC_LIBS_EVENTS_H
+#define GRAPHICS_MFC_LIBS_EVENTS_H
#include "common/events.h"
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -77,6 +77,6 @@ public:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/list.h b/graphics/mfc/libs/list.h
similarity index 91%
rename from engines/bagel/mfc/libs/list.h
rename to graphics/mfc/libs/list.h
index ca89bb30a21..03a3d6667c3 100644
--- a/engines/bagel/mfc/libs/list.h
+++ b/graphics/mfc/libs/list.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_LIST_H
-#define BAGEL_MFC_LIBS_LIST_H
+#ifndef GRAPHICS_MFC_LIBS_LIST_H
+#define GRAPHICS_MFC_LIBS_LIST_H
#include "common/list.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -42,6 +42,6 @@ public:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/resources.cpp b/graphics/mfc/libs/resources.cpp
similarity index 95%
rename from engines/bagel/mfc/libs/resources.cpp
rename to graphics/mfc/libs/resources.cpp
index 7dcf3acede3..475621460f9 100644
--- a/engines/bagel/mfc/libs/resources.cpp
+++ b/graphics/mfc/libs/resources.cpp
@@ -21,10 +21,10 @@
#include "common/stream.h"
#include "common/formats/winexe_ne.h"
-#include "bagel/mfc/libs/resources.h"
-#include "bagel/mfc/global_functions.h"
+#include "graphics/mfc/libs/resources.h"
+#include "graphics/mfc/global_functions.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -108,4 +108,4 @@ HGLOBAL Resources::loadResource(HRSRC hResInfo) {
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/libs/resources.h b/graphics/mfc/libs/resources.h
similarity index 93%
rename from engines/bagel/mfc/libs/resources.h
rename to graphics/mfc/libs/resources.h
index 85aa4a5ea35..bcffd133a85 100644
--- a/engines/bagel/mfc/libs/resources.h
+++ b/graphics/mfc/libs/resources.h
@@ -19,16 +19,16 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_RESOURCES_H
-#define BAGEL_MFC_LIBS_RESOURCES_H
+#ifndef GRAPHICS_MFC_LIBS_RESOURCES_H
+#define GRAPHICS_MFC_LIBS_RESOURCES_H
#include "common/list.h"
#include "common/path.h"
#include "common/hashmap.h"
#include "common/formats/winexe.h"
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -99,6 +99,6 @@ public:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/libs/settings.cpp b/graphics/mfc/libs/settings.cpp
similarity index 97%
rename from engines/bagel/mfc/libs/settings.cpp
rename to graphics/mfc/libs/settings.cpp
index 5953e816126..092b362c255 100644
--- a/engines/bagel/mfc/libs/settings.cpp
+++ b/graphics/mfc/libs/settings.cpp
@@ -21,9 +21,9 @@
#include "common/system.h"
#include "engines/engine.h"
-#include "bagel/mfc/libs/settings.h"
+#include "graphics/mfc/libs/settings.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -143,4 +143,4 @@ void Settings::Domain::flushToDisk() {
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/libs/settings.h b/graphics/mfc/libs/settings.h
similarity index 96%
rename from engines/bagel/mfc/libs/settings.h
rename to graphics/mfc/libs/settings.h
index f8a27a09624..6bb01077e14 100644
--- a/engines/bagel/mfc/libs/settings.h
+++ b/graphics/mfc/libs/settings.h
@@ -19,14 +19,14 @@
*
*/
-#ifndef BAGEL_MFC_LIBS_SETTINGS_H
-#define BAGEL_MFC_LIBS_SETTINGS_H
+#ifndef GRAPHICS_MFC_LIBS_SETTINGS_H
+#define GRAPHICS_MFC_LIBS_SETTINGS_H
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/savefile.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
namespace Libs {
@@ -136,6 +136,6 @@ private:
} // namespace Libs
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/listbox.cpp b/graphics/mfc/listbox.cpp
similarity index 92%
rename from engines/bagel/mfc/listbox.cpp
rename to graphics/mfc/listbox.cpp
index 7fc87e83853..c5352ec768f 100644
--- a/engines/bagel/mfc/listbox.cpp
+++ b/graphics/mfc/listbox.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CListBox, CWnd)
@@ -30,4 +30,4 @@ BEGIN_MESSAGE_MAP(CListBox, CWnd)
END_MESSAGE_MAP()
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/menu.cpp b/graphics/mfc/menu.cpp
similarity index 95%
rename from engines/bagel/mfc/menu.cpp
rename to graphics/mfc/menu.cpp
index 479d5760cdb..165abae9360 100644
--- a/engines/bagel/mfc/menu.cpp
+++ b/graphics/mfc/menu.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
CMenu::CMenu() {
@@ -57,4 +57,4 @@ unsigned int CMenu::CheckMenuItem(unsigned int nIDCheckItem, unsigned int nCheck
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/mfc.h b/graphics/mfc/mfc.h
similarity index 62%
rename from engines/bagel/mfc/mfc.h
rename to graphics/mfc/mfc.h
index 062823345c2..c733ed86933 100644
--- a/engines/bagel/mfc/mfc.h
+++ b/graphics/mfc/mfc.h
@@ -19,22 +19,22 @@
*
*/
-#ifndef BAGEL_MFC_MFC_H
-#define BAGEL_MFC_MFC_H
+#ifndef GRAPHICS_MFC_MFC_H
+#define GRAPHICS_MFC_MFC_H
-#include "bagel/mfc/minwindef.h"
-#include "bagel/mfc/winnt.h"
-#include "bagel/mfc/wingdi.h"
-#include "bagel/mfc/atltime.h"
-#include "bagel/mfc/atltypes.h"
-#include "bagel/mfc/afx.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/afxmsg.h"
-#include "bagel/mfc/afxext.h"
-#include "bagel/mfc/afxres.h"
-#include "bagel/mfc/global_functions.h"
-#include "bagel/mfc/ifstream.h"
-#include "bagel/mfc/joystickapi.h"
-#include "bagel/mfc/keyboard.h"
+#include "graphics/mfc/minwindef.h"
+#include "graphics/mfc/winnt.h"
+#include "graphics/mfc/wingdi.h"
+#include "graphics/mfc/atltime.h"
+#include "graphics/mfc/atltypes.h"
+#include "graphics/mfc/afx.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/afxmsg.h"
+#include "graphics/mfc/afxext.h"
+#include "graphics/mfc/afxres.h"
+#include "graphics/mfc/global_functions.h"
+#include "graphics/mfc/ifstream.h"
+#include "graphics/mfc/joystickapi.h"
+#include "graphics/mfc/keyboard.h"
#endif
diff --git a/engines/bagel/mfc/minwindef.h b/graphics/mfc/minwindef.h
similarity index 98%
rename from engines/bagel/mfc/minwindef.h
rename to graphics/mfc/minwindef.h
index 34cad2171f6..738f845825c 100644
--- a/engines/bagel/mfc/minwindef.h
+++ b/graphics/mfc/minwindef.h
@@ -19,16 +19,16 @@
*
*/
-#ifndef BAGEL_MFC_MINWINDEF_H
-#define BAGEL_MFC_MINWINDEF_H
+#ifndef GRAPHICS_MFC_MINWINDEF_H
+#define GRAPHICS_MFC_MINWINDEF_H
#include "common/scummsys.h"
#include "common/algorithm.h"
#include "common/rect.h"
#define WINVER 0
-#include "bagel/mfc/winnt.h"
+#include "graphics/mfc/winnt.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
#define ASSERT assert
@@ -294,6 +294,6 @@ struct CDataExchange {
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/graphics/mfc/module.mk b/graphics/mfc/module.mk
new file mode 100644
index 00000000000..48e2469d79f
--- /dev/null
+++ b/graphics/mfc/module.mk
@@ -0,0 +1,55 @@
+MODULE := graphics/mfc
+
+ifdef USE_MFC
+MODULE_OBJS := \
+ afx.o \
+ bitmap.o \
+ bitmap_button.o \
+ brush.o \
+ button.o \
+ cmd_target.o \
+ dialog.o \
+ dc.o \
+ doc_manager.o \
+ doc_template.o \
+ document.o \
+ edit.o \
+ file.o \
+ font.o \
+ frame_wnd.o \
+ gdi_object.o \
+ global_functions.o \
+ ifstream.o \
+ joystickapi.o \
+ listbox.o \
+ menu.o \
+ object.o \
+ paint_dc.o \
+ palette.o \
+ pen.o \
+ rgn.o \
+ scroll_view.o \
+ scrollbar.o \
+ single_doc_template.o \
+ static.o \
+ string.o \
+ view.o \
+ win_app.o \
+ win_thread.o \
+ wingdi.o \
+ wnd.o \
+ gfx/blitter.o \
+ gfx/surface.o \
+ gfx/cursor.o \
+ gfx/dialog_template.o \
+ gfx/fonts.o \
+ gfx/palette_map.o \
+ gfx/text_render.o \
+ libs/event_loop.o \
+ libs/events.o \
+ libs/resources.o \
+ libs/settings.o
+endif
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/engines/bagel/mfc/object.cpp b/graphics/mfc/object.cpp
similarity index 95%
rename from engines/bagel/mfc/object.cpp
rename to graphics/mfc/object.cpp
index b420e5a1f88..d55ebf1fe80 100644
--- a/engines/bagel/mfc/object.cpp
+++ b/graphics/mfc/object.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "bagel/mfc/mfc.h"
+#include "graphics/mfc/mfc.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
const CRuntimeClass CObject::classCObject = {
@@ -46,4 +46,4 @@ bool CObject::IsKindOf(const CRuntimeClass *pClass) const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/paint_dc.cpp b/graphics/mfc/paint_dc.cpp
similarity index 93%
rename from engines/bagel/mfc/paint_dc.cpp
rename to graphics/mfc/paint_dc.cpp
index f6fb5032a23..ae35f563329 100644
--- a/engines/bagel/mfc/paint_dc.cpp
+++ b/graphics/mfc/paint_dc.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CPaintDC, CDC)
@@ -40,4 +40,4 @@ CPaintDC::~CPaintDC() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/palette.cpp b/graphics/mfc/palette.cpp
similarity index 97%
rename from engines/bagel/mfc/palette.cpp
rename to graphics/mfc/palette.cpp
index cb4deeaa5bd..5ee067536c4 100644
--- a/engines/bagel/mfc/palette.cpp
+++ b/graphics/mfc/palette.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
bool CPalette::CreatePalette(LPLOGPALETTE lpLogPalette) {
@@ -137,4 +137,4 @@ CPalette::Impl::Impl(const Graphics::Palette &pal) :
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/pen.cpp b/graphics/mfc/pen.cpp
similarity index 93%
rename from engines/bagel/mfc/pen.cpp
rename to graphics/mfc/pen.cpp
index 9ca86e2cf2e..dc80402be81 100644
--- a/engines/bagel/mfc/pen.cpp
+++ b/graphics/mfc/pen.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
CPen::CPen(int nPenStyle, int nWidth, COLORREF crColor) {
@@ -36,4 +36,4 @@ bool CPen::CreatePen(int nPenStyle, int nWidth, COLORREF crColor) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/rgn.cpp b/graphics/mfc/rgn.cpp
similarity index 94%
rename from engines/bagel/mfc/rgn.cpp
rename to graphics/mfc/rgn.cpp
index 09ac58718f8..f1c895f221d 100644
--- a/engines/bagel/mfc/rgn.cpp
+++ b/graphics/mfc/rgn.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
bool CRgn::CreateRectRgn(int x1, int y1, int x2, int y2) {
@@ -46,4 +46,4 @@ bool CRgn::CreatePolygonRgn(const POINT *lpPoints,
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/scroll_view.cpp b/graphics/mfc/scroll_view.cpp
similarity index 94%
rename from engines/bagel/mfc/scroll_view.cpp
rename to graphics/mfc/scroll_view.cpp
index 5f3c4cf4be2..d7b1d23ea57 100644
--- a/engines/bagel/mfc/scroll_view.cpp
+++ b/graphics/mfc/scroll_view.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CScrollView, CView)
@@ -37,4 +37,4 @@ void CScrollView::SetScrollSizes(int nMapMode, SIZE sizeTotal,
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/scrollbar.cpp b/graphics/mfc/scrollbar.cpp
similarity index 98%
rename from engines/bagel/mfc/scrollbar.cpp
rename to graphics/mfc/scrollbar.cpp
index 907437540b5..1e3ea5ebdd1 100644
--- a/engines/bagel/mfc/scrollbar.cpp
+++ b/graphics/mfc/scrollbar.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CScrollBar, CWnd)
@@ -242,4 +242,4 @@ void CScrollBar::scrollEvent(int action) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/single_doc_template.cpp b/graphics/mfc/single_doc_template.cpp
similarity index 98%
rename from engines/bagel/mfc/single_doc_template.cpp
rename to graphics/mfc/single_doc_template.cpp
index ece396d1508..4bbee094b4c 100644
--- a/engines/bagel/mfc/single_doc_template.cpp
+++ b/graphics/mfc/single_doc_template.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CSingleDocTemplate, CDocTemplate)
@@ -154,4 +154,4 @@ CDocument *CSingleDocTemplate::GetNextDoc(POSITION &rPos) const {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/static.cpp b/graphics/mfc/static.cpp
similarity index 92%
rename from engines/bagel/mfc/static.cpp
rename to graphics/mfc/static.cpp
index cdcd3aa5b5a..fcf3c1b6f5b 100644
--- a/engines/bagel/mfc/static.cpp
+++ b/graphics/mfc/static.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CStatic, CWnd)
@@ -30,4 +30,4 @@ BEGIN_MESSAGE_MAP(CStatic, CWnd)
END_MESSAGE_MAP()
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/string.cpp b/graphics/mfc/string.cpp
similarity index 90%
rename from engines/bagel/mfc/string.cpp
rename to graphics/mfc/string.cpp
index 42867339147..6f154d0b66a 100644
--- a/engines/bagel/mfc/string.cpp
+++ b/graphics/mfc/string.cpp
@@ -20,10 +20,10 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxstr.h"
-#include "bagel/mfc/global_functions.h"
+#include "graphics/mfc/afxstr.h"
+#include "graphics/mfc/global_functions.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
bool CString::LoadString(unsigned int nID) {
@@ -37,4 +37,4 @@ bool CString::LoadString(unsigned int nID) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/view.cpp b/graphics/mfc/view.cpp
similarity index 96%
rename from engines/bagel/mfc/view.cpp
rename to graphics/mfc/view.cpp
index 92c1761596c..8473e95f56a 100644
--- a/engines/bagel/mfc/view.cpp
+++ b/graphics/mfc/view.cpp
@@ -20,9 +20,9 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CView, CWnd)
@@ -93,4 +93,4 @@ void CView::OnPaint() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/win_app.cpp b/graphics/mfc/win_app.cpp
similarity index 98%
rename from engines/bagel/mfc/win_app.cpp
rename to graphics/mfc/win_app.cpp
index d2777e6c4a9..b88b6b36c3d 100644
--- a/engines/bagel/mfc/win_app.cpp
+++ b/graphics/mfc/win_app.cpp
@@ -24,14 +24,14 @@
#include "common/events.h"
#include "common/textconsole.h"
#include "graphics/paletteman.h"
-#include "bagel/mfc/global_functions.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/win_hand.h"
-#include "bagel/mfc/gfx/cursor.h"
-#include "bagel/mfc/libs/events.h"
+#include "graphics/mfc/global_functions.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/win_hand.h"
+#include "graphics/mfc/gfx/cursor.h"
+#include "graphics/mfc/libs/events.h"
#include "engines/engine.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
/**
@@ -487,4 +487,4 @@ int GetSystemMetrics(int nIndex) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/win_hand.h b/graphics/mfc/win_hand.h
similarity index 95%
rename from engines/bagel/mfc/win_hand.h
rename to graphics/mfc/win_hand.h
index 5c8541a4687..0ce42a07f7e 100644
--- a/engines/bagel/mfc/win_hand.h
+++ b/graphics/mfc/win_hand.h
@@ -19,13 +19,13 @@
*
*/
-#ifndef BAGEL_MFC_WIN_HAND_H
-#define BAGEL_MFC_WIN_HAND_H
+#ifndef GRAPHICS_MFC_WIN_HAND_H
+#define GRAPHICS_MFC_WIN_HAND_H
#include "common/hashmap.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CGdiObject;
@@ -141,6 +141,6 @@ public:
};
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/win_thread.cpp b/graphics/mfc/win_thread.cpp
similarity index 92%
rename from engines/bagel/mfc/win_thread.cpp
rename to graphics/mfc/win_thread.cpp
index d7b48449e96..51479e3c64f 100644
--- a/engines/bagel/mfc/win_thread.cpp
+++ b/graphics/mfc/win_thread.cpp
@@ -20,12 +20,12 @@
*/
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
+#include "graphics/mfc/afxwin.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CWinThread, CCmdTarget)
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/wingdi.cpp b/graphics/mfc/wingdi.cpp
similarity index 97%
rename from engines/bagel/mfc/wingdi.cpp
rename to graphics/mfc/wingdi.cpp
index 6511c05d9d9..b53329abe7b 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/graphics/mfc/wingdi.cpp
@@ -21,13 +21,13 @@
#include "common/system.h"
#include "common/textconsole.h"
-#include "bagel/mfc/wingdi.h"
-#include "bagel/mfc/global_functions.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/gfx/blitter.h"
-#include "bagel/mfc/gfx/palette_map.h"
+#include "graphics/mfc/wingdi.h"
+#include "graphics/mfc/global_functions.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/gfx/blitter.h"
+#include "graphics/mfc/gfx/palette_map.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
int GetDeviceCaps(HDC hdc, int index) {
@@ -457,4 +457,4 @@ void SetActiveWindow(HWND hWnd) {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
diff --git a/engines/bagel/mfc/wingdi.h b/graphics/mfc/wingdi.h
similarity index 99%
rename from engines/bagel/mfc/wingdi.h
rename to graphics/mfc/wingdi.h
index 27fd2d760dc..28713d38318 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/graphics/mfc/wingdi.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_WINGDI_H
-#define BAGEL_MFC_WINGDI_H
+#ifndef GRAPHICS_MFC_WINGDI_H
+#define GRAPHICS_MFC_WINGDI_H
-#include "bagel/mfc/minwindef.h"
+#include "graphics/mfc/minwindef.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
class CDC;
@@ -807,6 +807,6 @@ extern bool DestroyMenu(HMENU hMenu);
extern void SetActiveWindow(HWND hWnd);
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/winnt.h b/graphics/mfc/winnt.h
similarity index 99%
rename from engines/bagel/mfc/winnt.h
rename to graphics/mfc/winnt.h
index 2fd045aa471..e244177d9af 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/graphics/mfc/winnt.h
@@ -19,12 +19,12 @@
*
*/
-#ifndef BAGEL_MFC_WINNT_H
-#define BAGEL_MFC_WINNT_H
+#ifndef GRAPHICS_MFC_WINNT_H
+#define GRAPHICS_MFC_WINNT_H
#include "common/scummsys.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
typedef uint16 SHORT;
@@ -726,6 +726,6 @@ typedef struct tagSCROLLINFO {
typedef const SCROLLINFO *LPCSCROLLINFO;
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
#endif
diff --git a/engines/bagel/mfc/wnd.cpp b/graphics/mfc/wnd.cpp
similarity index 99%
rename from engines/bagel/mfc/wnd.cpp
rename to graphics/mfc/wnd.cpp
index 2d8a0ea0111..1fb27ccb604 100644
--- a/engines/bagel/mfc/wnd.cpp
+++ b/graphics/mfc/wnd.cpp
@@ -22,12 +22,12 @@
#include "common/system.h"
#include "common/queue.h"
#include "common/textconsole.h"
-#include "bagel/mfc/afxwin.h"
-#include "bagel/mfc/wingdi.h"
-#include "bagel/mfc/win_hand.h"
-#include "bagel/mfc/gfx/dialog_template.h"
+#include "graphics/mfc/afxwin.h"
+#include "graphics/mfc/wingdi.h"
+#include "graphics/mfc/win_hand.h"
+#include "graphics/mfc/gfx/dialog_template.h"
-namespace Bagel {
+namespace Graphics {
namespace MFC {
IMPLEMENT_DYNAMIC(CWnd, CCmdTarget)
@@ -1265,4 +1265,4 @@ bool CWnd::OnQueryNewPalette() {
}
} // namespace MFC
-} // namespace Bagel
+} // namespace Graphics
Commit: 27bf39725cc608f893ca9ff87420e5542e9ff579
https://github.com/scummvm/scummvm/commit/27bf39725cc608f893ca9ff87420e5542e9ff579
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-09T17:20:32+11:00
Commit Message:
BAGEL: MINIGAMES: Fix menures.h header define
Co-authored-by: Filippos Karapetis <bluegr at gmail.com>
Changed paths:
engines/bagel/hodjnpodj/hnplibs/menures.h
diff --git a/engines/bagel/hodjnpodj/hnplibs/menures.h b/engines/bagel/hodjnpodj/hnplibs/menures.h
index 62bbb507c2e..0a8b8640e53 100644
--- a/engines/bagel/hodjnpodj/hnplibs/menures.h
+++ b/engines/bagel/hodjnpodj/hnplibs/menures.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef COMMON_MFC_GLOBAL_MENURES_H
-#define COMMON_MFC_GLOBAL_MENURES_H
+#ifndef HODJNPODJ_HNPLIBS_MENURES_H
+#define HODJNPODJ_HNPLIBS_MENURES_H
#define IDC_OPTIONS_ARROWUP 503
#define IDC_OPTIONS_ARROWDN 504
More information about the Scummvm-git-logs
mailing list