diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
| commit | 48646db55005a0da079bd2c945875dc8225e2f86 (patch) | |
| tree | 4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/gui.h | |
| parent | 9c12fcdfe590f34543fcecc2691b625c408f1746 (diff) | |
| download | manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2 manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.zip | |
Move color into gui dir.
Diffstat (limited to 'src/gui/gui.h')
| -rw-r--r-- | src/gui/gui.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/gui.h b/src/gui/gui.h index f6b4fbbf6..232d47a22 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -23,7 +23,8 @@ #ifndef GUI_GUI_H #define GUI_GUI_H -#include "gui/base/color.hpp" +#include "gui/color.h" + #include "gui/base/gui.hpp" #include "localconsts.h" @@ -198,8 +199,8 @@ class Gui final : public gcn::Gui typedef std::list<FocusListener*> FocusListenerList; typedef FocusListenerList::iterator FocusListenerIterator; FocusListenerList mFocusListeners; - gcn::Color mForegroundColor; - gcn::Color mForegroundColor2; + Color mForegroundColor; + Color mForegroundColor2; int mTime; bool mCustomCursor; /**< Show custom cursor */ bool mDoubleClick; |