diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 23:40:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 23:40:05 +0300 |
| commit | 01d93aedcc4d1632ff5915c3989a502ec31cd978 (patch) | |
| tree | c66fef008a583f4a9c556e4fd7577cd08db5ac17 /src/gui/base/widgets | |
| parent | 580ce9af9e9a241aac083107b18c9c81e1c1da0d (diff) | |
| download | manaplus-01d93aedcc4d1632ff5915c3989a502ec31cd978.tar.gz manaplus-01d93aedcc4d1632ff5915c3989a502ec31cd978.tar.bz2 manaplus-01d93aedcc4d1632ff5915c3989a502ec31cd978.tar.xz manaplus-01d93aedcc4d1632ff5915c3989a502ec31cd978.zip | |
move focuslistener from base into listeners.
Diffstat (limited to 'src/gui/base/widgets')
| -rw-r--r-- | src/gui/base/widgets/button.cpp | 4 | ||||
| -rw-r--r-- | src/gui/base/widgets/button.hpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp index 3e699670a..82ff878a0 100644 --- a/src/gui/base/widgets/button.cpp +++ b/src/gui/base/widgets/button.cpp @@ -83,7 +83,7 @@ namespace gcn gcn::Widget(), gcn::MouseListener(), gcn::KeyListener(), - gcn::FocusListener(), + FocusListener(), mCaption(), mHasMouse(false), mKeyPressed(false), @@ -104,7 +104,7 @@ namespace gcn gcn::Widget(), gcn::MouseListener(), gcn::KeyListener(), - gcn::FocusListener(), + FocusListener(), mCaption(caption), mHasMouse(false), mKeyPressed(false), diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp index cd41a1b02..e2d6c0c8e 100644 --- a/src/gui/base/widgets/button.hpp +++ b/src/gui/base/widgets/button.hpp @@ -66,10 +66,11 @@ #include <string> -#include "gui/base/focuslistener.hpp" +#include "listeners/focuslistener.h" #include "gui/base/keylistener.hpp" -#include "gui/base/mouseevent.hpp" #include "gui/base/mouselistener.hpp" + +#include "gui/base/mouseevent.hpp" #include "gui/base/widget.hpp" #include "render/graphics.h" |