diff options
-rw-r--r-- | engines/wage/macwindow.cpp | 8 | ||||
-rw-r--r-- | engines/wage/macwindowmanager.cpp | 58 | ||||
-rw-r--r-- | engines/wage/macwindowmanager.h | 60 | ||||
-rw-r--r-- | engines/wage/module.mk | 2 |
4 files changed, 124 insertions, 4 deletions
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp index 002422e4fa..a745755c07 100644 --- a/engines/wage/macwindow.cpp +++ b/engines/wage/macwindow.cpp @@ -51,7 +51,7 @@ namespace Wage { MacWindow::MacWindow(WindowType type) : _type(type) { _active = false; - _bordersDirty = true; + _borderIsDirty = true; } MacWindow::~MacWindow() { @@ -62,7 +62,7 @@ void MacWindow::setActive(bool active) { return; _active = active; - _bordersDirty = true; + _borderIsDirty = true; } void MacWindow::resize(int w, int h) { @@ -72,12 +72,12 @@ void MacWindow::resize(int w, int h) { } void MacWindow::draw(Graphics::Surface *g, int x, int y) { - if (_bordersDirty) + if (_borderIsDirty) drawBorder(); } void MacWindow::drawBorder() { - _bordersDirty = false; + _borderIsDirty = false; } } // End of namespace Wage diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp new file mode 100644 index 0000000000..02e47a148e --- /dev/null +++ b/engines/wage/macwindowmanager.cpp @@ -0,0 +1,58 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#include "wage/macwindowmanager.h" + +namespace Wage { + +MacWindowManager::MacWindowManager() { +} + +MacWindowManager::~MacWindowManager() { +} + +} // End of namespace Wage diff --git a/engines/wage/macwindowmanager.h b/engines/wage/macwindowmanager.h new file mode 100644 index 0000000000..eaec462d5d --- /dev/null +++ b/engines/wage/macwindowmanager.h @@ -0,0 +1,60 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * MIT License: + * + * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef WAGE_MACWINDOWMANAGER_H +#define WAGE_MACWINDOWMANAGER_H + +namespace Wage { + +class MacWindowManager { + MacWindowManager(); + ~MacWindowManager(); +}; + +} // End of namespace Wage + +#endif diff --git a/engines/wage/module.mk b/engines/wage/module.mk index 21316bbf83..d65934fc2b 100644 --- a/engines/wage/module.mk +++ b/engines/wage/module.mk @@ -9,6 +9,8 @@ MODULE_OBJS := \ entities.o \ gui.o \ gui-console.o \ + macwindow.o \ + macwindowmanager.o \ menu.o \ randomhat.o \ script.o \ |