diff options
| -rw-r--r-- | engines/wage/gui-console.cpp | 2 | ||||
| -rw-r--r-- | engines/wage/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/wage/gui.h | 3 | ||||
| -rw-r--r-- | engines/wage/macmenu.cpp | 2 | ||||
| -rw-r--r-- | engines/wage/module.mk | 1 | ||||
| -rw-r--r-- | graphics/macgui/macwindow.cpp (renamed from engines/wage/macwindow.cpp) | 9 | ||||
| -rw-r--r-- | graphics/macgui/macwindow.h (renamed from engines/wage/macwindow.h) | 0 | ||||
| -rw-r--r-- | graphics/macgui/macwindowmanager.cpp | 2 | ||||
| -rw-r--r-- | graphics/macgui/macwindowmanager.h | 3 | ||||
| -rw-r--r-- | graphics/module.mk | 3 |
10 files changed, 12 insertions, 15 deletions
diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp index a856a0d75a..1ae0384f4f 100644 --- a/engines/wage/gui-console.cpp +++ b/engines/wage/gui-console.cpp @@ -51,11 +51,11 @@ #include "graphics/cursorman.h" #include "graphics/fonts/bdf.h" #include "graphics/palette.h" +#include "graphics/macgui/macwindow.h" #include "wage/wage.h" #include "wage/design.h" #include "wage/entities.h" -#include "wage/macwindow.h" #include "wage/macmenu.h" #include "wage/gui.h" #include "wage/world.h" diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 5a28835f77..532aa5fa98 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -50,12 +50,12 @@ #include "graphics/cursorman.h" #include "graphics/primitives.h" #include "graphics/macgui/macwindowmanager.h" +#include "graphics/macgui/macwindow.h" #include "wage/wage.h" #include "wage/design.h" #include "wage/entities.h" #include "wage/gui.h" -#include "wage/macwindow.h" #include "wage/macmenu.h" #include "wage/world.h" diff --git a/engines/wage/gui.h b/engines/wage/gui.h index fd0447acf0..7355797781 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -52,12 +52,11 @@ #include "graphics/font.h" #include "graphics/managed_surface.h" #include "graphics/macgui/macwindowmanager.h" +#include "graphics/macgui/macwindow.h" #include "common/events.h" #include "common/rect.h" -#include "wage/macwindow.h" - namespace Wage { class Menu; diff --git a/engines/wage/macmenu.cpp b/engines/wage/macmenu.cpp index 5d799061cc..d6dec32269 100644 --- a/engines/wage/macmenu.cpp +++ b/engines/wage/macmenu.cpp @@ -51,8 +51,8 @@ #include "graphics/primitives.h" #include "graphics/font.h" #include "graphics/macgui/macwindowmanager.h" +#include "graphics/macgui/macwindow.h" -#include "wage/macwindow.h" #include "wage/macmenu.h" namespace Wage { diff --git a/engines/wage/module.mk b/engines/wage/module.mk index 43f0f0fdfc..46d3980704 100644 --- a/engines/wage/module.mk +++ b/engines/wage/module.mk @@ -10,7 +10,6 @@ MODULE_OBJS := \ gui.o \ gui-console.o \ macmenu.o \ - macwindow.o \ randomhat.o \ saveload.o \ script.o \ diff --git a/engines/wage/macwindow.cpp b/graphics/macgui/macwindow.cpp index 39ad739942..0d43b6daaf 100644 --- a/engines/wage/macwindow.cpp +++ b/graphics/macgui/macwindow.cpp @@ -49,8 +49,7 @@ #include "graphics/primitives.h" #include "common/events.h" #include "graphics/macgui/macwindowmanager.h" - -#include "wage/macwindow.h" +#include "graphics/macgui/macwindow.h" namespace Graphics { @@ -264,16 +263,16 @@ void MacWindow::setHighlight(WindowClick highlightedPart) { _highlightedPart = highlightedPart; _borderIsDirty = true; -} + } -void MacWindow::setScroll(float scrollPos, float scrollSize) { + void MacWindow::setScroll(float scrollPos, float scrollSize) { if (_scrollPos == scrollPos && _scrollSize == scrollSize) return; _scrollPos = scrollPos; _scrollSize = scrollSize; _borderIsDirty = true; -} + } void MacWindow::drawBox(ManagedSurface *g, int x, int y, int w, int h) { diff --git a/engines/wage/macwindow.h b/graphics/macgui/macwindow.h index 55f9d5c5ad..55f9d5c5ad 100644 --- a/engines/wage/macwindow.h +++ b/graphics/macgui/macwindow.h diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp index 6ec1831454..dc2c46c30d 100644 --- a/graphics/macgui/macwindowmanager.cpp +++ b/graphics/macgui/macwindowmanager.cpp @@ -58,8 +58,8 @@ #include "graphics/palette.h" #include "graphics/primitives.h" #include "graphics/macgui/macwindowmanager.h" +#include "graphics/macgui/macwindow.h" -#include "wage/macwindow.h" #include "wage/macmenu.h" namespace Graphics { diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h index 45532edf1e..9a8be93aa8 100644 --- a/graphics/macgui/macwindowmanager.h +++ b/graphics/macgui/macwindowmanager.h @@ -54,8 +54,7 @@ #include "common/archive.h" #include "graphics/fontman.h" - -#include "engines/wage/macwindow.h" +#include "graphics/macgui/macwindow.h" namespace Wage { class MacWindow; diff --git a/graphics/module.mk b/graphics/module.mk index 4d6c11bf6d..2e033d9e5b 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -29,7 +29,8 @@ MODULE_OBJS := \ VectorRendererSpec.o \ wincursor.o \ yuv_to_rgb.o \ - macgui/macwindowmanager.o + macgui/macwindowmanager.o\ + macgui/macwindow.o ifdef USE_SCALERS MODULE_OBJS += \ |