diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-17 21:31:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-17 21:31:57 +0300 |
| commit | a520c88cabf03973ddf27435eb5a970f9c214d30 (patch) | |
| tree | 395cf08d06fd26a20c1274862591dca8d9ba0013 /src/gui/widgets | |
| parent | 695fadf9f104443e3a925c88c074b0585a51f81c (diff) | |
| download | mv-a520c88cabf03973ddf27435eb5a970f9c214d30.tar.gz mv-a520c88cabf03973ddf27435eb5a970f9c214d30.tar.bz2 mv-a520c88cabf03973ddf27435eb5a970f9c214d30.tar.xz mv-a520c88cabf03973ddf27435eb5a970f9c214d30.zip | |
combine focushandler into one file.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/guitable.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/guitable.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/listbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index f87ca2fe7..1b1124cff 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -588,7 +588,7 @@ int GuiTable::getColumnForX(int x) const return column; } -void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) +void GuiTable::_setFocusHandler(FocusHandler* focusHandler) { // add check for focusHandler. may be need remove it? diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index da367dd94..ab7dc1a66 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -122,7 +122,7 @@ public: void moveToBottom(gcn::Widget *child) override final; - void _setFocusHandler(gcn::FocusHandler* focusHandler) override final; + void _setFocusHandler(FocusHandler* focusHandler) override final; // Inherited from KeyListener void keyPressed(KeyEvent& keyEvent) override final; diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 537c7283c..c2fa1a686 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -28,10 +28,10 @@ #include "input/keydata.h" +#include "gui/focushandler.h" #include "gui/font.h" #include "gui/gui.h" -#include "gui/base/focushandler.hpp" #include "gui/base/listmodel.hpp" #include "render/graphics.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index e2f24a0f2..2ea86f9df 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -29,6 +29,7 @@ #include "soundconsts.h" #include "soundmanager.h" +#include "gui/focushandler.h" #include "gui/font.h" #include "gui/gui.h" #include "gui/viewport.h" @@ -38,8 +39,6 @@ #include "resources/cursor.h" #include "resources/image.h" -#include "gui/base/focushandler.hpp" - #include "debug.h" const int resizeMask = 8 + 4 + 2 + 1; |