summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/buttoninfo.h43
-rw-r--r--src/gui/windowmenu.cpp1
-rw-r--r--src/gui/windowmenu.h17
5 files changed, 47 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a3dea452e..2af6b00b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -887,6 +887,7 @@ SET(SRCS
events/actionevent.h
listeners/actionlistener.h
gui/widgets/basiccontainer.h
+ gui/buttoninfo.h
gui/chatconsts.h
gui/chatlog.h
gui/cliprect.h
diff --git a/src/Makefile.am b/src/Makefile.am
index e2df5a905..2beb3740f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,6 +155,7 @@ endif
manaplus_SOURCES += events/actionevent.h \
listeners/actionlistener.h \
gui/widgets/basiccontainer.h \
+ gui/buttoninfo.h \
gui/chatconsts.h \
gui/chatlog.h \
gui/cliprect.h \
diff --git a/src/gui/buttoninfo.h b/src/gui/buttoninfo.h
new file mode 100644
index 000000000..985cbd8a8
--- /dev/null
+++ b/src/gui/buttoninfo.h
@@ -0,0 +1,43 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_BUTTONINFO_H
+#define GUI_BUTTONINFO_H
+
+#include "localconsts.h"
+
+class Button;
+
+struct ButtonInfo final
+{
+ ButtonInfo(Button *const button0, const int key0, const bool visible0) :
+ button(button0),
+ key(key0),
+ visible(visible0)
+ {
+ }
+
+ A_DELETE_COPY(ButtonInfo)
+
+ Button *button;
+ int key;
+ bool visible;
+};
+#endif // GUI_BUTTONINFO_H
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 30a517173..a45cfd7b8 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -26,6 +26,7 @@
#include "input/inputmanager.h"
+#include "gui/buttoninfo.h"
#include "gui/skin.h"
#include "gui/viewport.h"
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 9eb520bff..07067debd 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -37,24 +37,9 @@
#include <vector>
class Button;
+class ButtonInfo;
class TextPopup;
-struct ButtonInfo final
-{
- ButtonInfo(Button *const button0, const int key0, const bool visible0) :
- button(button0),
- key(key0),
- visible(visible0)
- {
- }
-
- A_DELETE_COPY(ButtonInfo)
-
- Button *button;
- int key;
- bool visible;
-};
-
struct ButtonText final
{
ButtonText(const std::string &text0, const int key0) :