diff options
| author | Borja Lorente | 2016-07-29 12:03:52 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-07-31 14:05:14 +0200 |
| commit | 1080f199957326261245da49bf0efe5059b17a18 (patch) | |
| tree | 985768fe0ff65aa8ccb67c6227c4e9b89a177ed3 /engines | |
| parent | 941617fc3829d545cd35ada87f770655004e9914 (diff) | |
| download | scummvm-rg350-1080f199957326261245da49bf0efe5059b17a18.tar.gz scummvm-rg350-1080f199957326261245da49bf0efe5059b17a18.tar.bz2 scummvm-rg350-1080f199957326261245da49bf0efe5059b17a18.zip | |
GRAPHICS: Create wrapper namespace for MacWindowManager constants
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wage/design.h | 13 | ||||
| -rw-r--r-- | engines/wage/gui.h | 1 | ||||
| -rw-r--r-- | engines/wage/world.h | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/engines/wage/design.h b/engines/wage/design.h index c64ae6d065..7a422a48f0 100644 --- a/engines/wage/design.h +++ b/engines/wage/design.h @@ -55,6 +55,9 @@ namespace Wage { +using namespace Graphics::MacGUIConstants; +using Graphics::Patterns; + class Design { public: Design(Common::SeekableReadStream *data); @@ -88,15 +91,15 @@ private: bool _boundsCalculationMode; private: - void render(Graphics::Patterns &patterns); + void render(Patterns &patterns); void drawRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, - Graphics::Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); + Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); void drawRoundRect(Graphics::ManagedSurface *surface, Common::ReadStream &in, - Graphics::Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); + Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); void drawPolygon(Graphics::ManagedSurface *surface, Common::ReadStream &in, - Graphics::Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); + Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); void drawOval(Graphics::ManagedSurface *surface, Common::ReadStream &in, - Graphics::Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); + Patterns &patterns, byte fillType, byte borderThickness, byte borderFillType); void drawBitmap(Graphics::ManagedSurface *surface, Common::SeekableReadStream &in); }; diff --git a/engines/wage/gui.h b/engines/wage/gui.h index 7a2edb57c6..8536a76fe1 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -63,6 +63,7 @@ namespace Wage { // Import the enum definitions using namespace Graphics::MacMenuConstants; using namespace Graphics::MacWindowConstants; +using namespace Graphics::MacGUIConstants; class Scene; class WageEngine; diff --git a/engines/wage/world.h b/engines/wage/world.h index b3908be81c..e0e044822c 100644 --- a/engines/wage/world.h +++ b/engines/wage/world.h @@ -53,6 +53,9 @@ namespace Wage { +// Import the enum definitions +using Graphics::Patterns; + class Script; class Sound; |