diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-17 19:54:35 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-17 19:54:35 +0300 |
commit | ad6d93bed95046d983c005fce409e8e5328ce46f (patch) | |
tree | 7dda83948acdea0b762d60bbe8f442b7947494b0 /src/gui | |
parent | 8035bc3225899800c239689c32503542f97dd19d (diff) | |
download | manaplus-ad6d93bed95046d983c005fce409e8e5328ce46f.tar.gz manaplus-ad6d93bed95046d983c005fce409e8e5328ce46f.tar.bz2 manaplus-ad6d93bed95046d983c005fce409e8e5328ce46f.tar.xz manaplus-ad6d93bed95046d983c005fce409e8e5328ce46f.zip |
Move buttoninfo into separate file.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/buttoninfo.h | 43 | ||||
-rw-r--r-- | src/gui/windowmenu.cpp | 1 | ||||
-rw-r--r-- | src/gui/windowmenu.h | 17 |
3 files changed, 45 insertions, 16 deletions
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) : |