diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-17 00:41:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-17 00:41:13 +0300 |
| commit | 9a85b675f326c956b2c87af296c724a68192d7cc (patch) | |
| tree | abe0fcd97cdc39e9e31daeda29e12b92acc97ee8 /src/gui/base/gui.cpp | |
| parent | e78036b3372e5773fac4207ea48bb61e2fd7873e (diff) | |
| download | manaplus-9a85b675f326c956b2c87af296c724a68192d7cc.tar.gz manaplus-9a85b675f326c956b2c87af296c724a68192d7cc.tar.bz2 manaplus-9a85b675f326c956b2c87af296c724a68192d7cc.tar.xz manaplus-9a85b675f326c956b2c87af296c724a68192d7cc.zip | |
combine input into one file.
Diffstat (limited to 'src/gui/base/gui.cpp')
| -rw-r--r-- | src/gui/base/gui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/base/gui.cpp b/src/gui/base/gui.cpp index e5291cb60..02c6e6674 100644 --- a/src/gui/base/gui.cpp +++ b/src/gui/base/gui.cpp @@ -69,9 +69,10 @@ #include "gui/base/basiccontainer.hpp" #include "gui/base/focushandler.hpp" -#include "gui/base/input.hpp" #include "gui/base/widget.hpp" +#include "gui/sdlinput.h" + #include "input/keyinput.h" #include "input/mouseinput.h" @@ -139,12 +140,12 @@ namespace gcn return mGraphics; } - void Gui::setInput(Input* input) + void Gui::setInput(SDLInput* input) { mInput = input; } - Input* Gui::getInput() const + SDLInput* Gui::getInput() const { return mInput; } |