summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-11-14 09:26:03 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-06 23:27:21 +0100
commitdfd31a12ae8a8d44b622b6aa2cd922fca18edf37 (patch)
tree5b9e3adf15b156f1e17947ce4bd8b464c58dc423 /src
parent20d247cb9849bb7fb0e4df993a2fc0f0e0d5bf74 (diff)
downloadmana-client-dfd31a12ae8a8d44b622b6aa2cd922fca18edf37.tar.gz
mana-client-dfd31a12ae8a8d44b622b6aa2cd922fca18edf37.tar.bz2
mana-client-dfd31a12ae8a8d44b622b6aa2cd922fca18edf37.tar.xz
mana-client-dfd31a12ae8a8d44b622b6aa2cd922fca18edf37.zip
Fixed up and down arrows in chat box.
(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5) Conflicts: src/gui/chat.cpp
Diffstat (limited to 'src')
-rw-r--r--src/gui/chat.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index aa24ba7f..3c02e656 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -23,13 +23,13 @@
#include <sstream>
#include <guichan/focushandler.hpp>
-#include <guichan/key.hpp>
#include "chat.h"
#include "browserbox.h"
#include "chatinput.h"
#include "scrollarea.h"
+#include "sdlinput.h"
#include "windowcontainer.h"
#include "../configuration.h"
@@ -439,7 +439,7 @@ void ChatWindow::scroll(int amount)
void ChatWindow::keyPressed(gcn::KeyEvent &event)
{
- if (event.getKey().getValue() == gcn::Key::DOWN &&
+ if (event.getKey().getValue() == Key::DOWN &&
mCurHist != mHistory.end())
{
// Move forward through the history
@@ -452,7 +452,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
mCurHist = prevHist;
}
}
- else if (event.getKey().getValue() == gcn::Key::UP &&
+ else if (event.getKey().getValue() == Key::UP &&
mCurHist != mHistory.begin() && mHistory.size() > 0)
{
// Move backward through the history