diff options
Diffstat (limited to 'engines/macventure/gui.h')
-rw-r--r-- | engines/macventure/gui.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/engines/macventure/gui.h b/engines/macventure/gui.h index 983dc10f74..9316f91fd3 100644 --- a/engines/macventure/gui.h +++ b/engines/macventure/gui.h @@ -109,6 +109,7 @@ struct ControlData { uint32 refcon; uint8 titleLength; char* title; + uint16 border; }; @@ -123,6 +124,13 @@ public: void handleMenuAction(MenuAction action); bool processCommandEvents(WindowClick click, Common::Event &event); + const WindowData& getWindowData(WindowReference reference); + + const Graphics::Font& getCurrentFont(); + + // Ugly switches + uint16 borderThickness(MVWindowType type); + private: // Attributes MacVentureEngine *_engine; @@ -131,16 +139,30 @@ private: // Attributes Graphics::ManagedSurface _screen; Graphics::MacWindowManager _wm; + Common::List<WindowData> *_windowData; + Common::List<CommandButton> *_controlData; + + Graphics::MacWindow *_controlsWindow; + Graphics::MacWindow *_mainGameWindow; Graphics::MacWindow *_outConsoleWindow; + Graphics::MacWindow *_selfWindow; + Graphics::MacWindow *_exitsWindow; + Graphics::MacWindow *_diplomaWindow; Graphics::Menu *_menu; private: // Methods + + // Initializers void initGUI(); + void initWindows(); + + // Loaders bool loadMenus(); void loadBorder(Graphics::MacWindow * target, Common::String filename, bool active); - uint16 borderThickness(MVWindowType type); + // Drawers + void drawCommandsWindow(); }; @@ -160,7 +182,6 @@ public: void draw(Graphics::ManagedSurface &surface) const { - surface.fillRect(_data.bounds, kColorWhite); surface.frameRect(_data.bounds, kColorBlack); |