summaryrefslogtreecommitdiff
path: root/src/guiMessageMenu.h
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-06-27 06:56:26 -0700
commit1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch)
tree63c1116ff43936475874b54d171c7e08556d54ee /src/guiMessageMenu.h
parent158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff)
parent7efe89ff584b2c0338dcede4c1e08504d0158780 (diff)
downloadminetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz
minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2
minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.zip
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/guiMessageMenu.h')
-rw-r--r--src/guiMessageMenu.h48
1 files changed, 25 insertions, 23 deletions
diff --git a/src/guiMessageMenu.h b/src/guiMessageMenu.h
index 8f48b6626..82c40ce09 100644
--- a/src/guiMessageMenu.h
+++ b/src/guiMessageMenu.h
@@ -1,21 +1,21 @@
/*
- Minetest-c55
- Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
- 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 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.
+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.
- */
+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.
+*/
#ifndef GUIMESSAGEMENU_HEADER
#define GUIMESSAGEMENU_HEADER
@@ -25,17 +25,19 @@
#include "utility.h"
#include <string>
-class GUIMessageMenu: public GUIModalMenu
+class GUIMessageMenu : public GUIModalMenu
{
public:
- GUIMessageMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
- IMenuManager *menumgr, std::wstring message_text);
+ GUIMessageMenu(gui::IGUIEnvironment* env,
+ gui::IGUIElement* parent, s32 id,
+ IMenuManager *menumgr,
+ std::wstring message_text);
~GUIMessageMenu();
-
+
void removeChildren();
/*
- Remove and re-add (or reposition) stuff
- */
+ Remove and re-add (or reposition) stuff
+ */
void regenerateGui(v2u32 screensize);
void drawMenu();
@@ -43,13 +45,13 @@ public:
bool OnEvent(const SEvent& event);
/*
- true = ok'd
- */
+ true = ok'd
+ */
bool getStatus()
{
return m_status;
}
-
+
private:
std::wstring m_message_text;
bool m_status;