From d42a8d0f2dbd98a466c4a1ca0f64ca18561211f9 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 13 Apr 2016 10:23:17 +0200 Subject: WAGE: Stub for MacWindow class --- engines/wage/gui.h | 7 ++--- engines/wage/macwindow.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++ engines/wage/macwindow.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 engines/wage/macwindow.cpp create mode 100644 engines/wage/macwindow.h (limited to 'engines') diff --git a/engines/wage/gui.h b/engines/wage/gui.h index 48ec41c30a..fac41ce5cc 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -54,15 +54,12 @@ #include "graphics/surface.h" #include "common/rect.h" +#include "wage/macwindow.h" + namespace Wage { class Menu; -enum WindowType { - kWindowScene, - kWindowConsole -}; - enum { kMenuHeight = 20, kMenuLeftMargin = 7, diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp new file mode 100644 index 0000000000..a9be4458fa --- /dev/null +++ b/engines/wage/macwindow.cpp @@ -0,0 +1,68 @@ +/* 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/macwindow.h" + +namespace Wage { + +MacWindow::MacWindow(WindowType type) : _type(type) { +} + +MacWindow::~MacWindow() { +} + +void MacWindow::resize(int w, int h) { + _surface.free(); + + _surface.create(w, h, Graphics::PixelFormat::createFormatCLUT8()); +} + +void MacWindow::draw(Graphics::Surface *g, int x, int y) { + +} + +} // End of namespace Wage diff --git a/engines/wage/macwindow.h b/engines/wage/macwindow.h new file mode 100644 index 0000000000..370468e8db --- /dev/null +++ b/engines/wage/macwindow.h @@ -0,0 +1,73 @@ +/* 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_MACWINDOW_H +#define WAGE_MACWINDOW_H + +#include "graphics/managed_surface.h" + +namespace Wage { + +enum WindowType { + kWindowScene, + kWindowConsole +}; + +class MacWindow { + MacWindow(WindowType type); + ~MacWindow(); + void resize(int w, int h); + void draw(Graphics::Surface *g, int x, int y); + +private: + Graphics::ManagedSurface _surface; + WindowType _type; +}; + +} // End of namespace Wage + +#endif -- cgit v1.2.3