summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-11-14 09:26:03 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-11-14 09:26:03 +0000
commitcb04d148c9aed572fe6e66313100e2cd9b66f5d5 (patch)
treec725c06c4d83c9472ad7f4ec7f5f4d36e1511c19
parent64275b15b7e14b8c7b618aeed7622fff596ec6f2 (diff)
downloadmana-cb04d148c9aed572fe6e66313100e2cd9b66f5d5.tar.gz
mana-cb04d148c9aed572fe6e66313100e2cd9b66f5d5.tar.bz2
mana-cb04d148c9aed572fe6e66313100e2cd9b66f5d5.tar.xz
mana-cb04d148c9aed572fe6e66313100e2cd9b66f5d5.zip
Fixed up and down arrows in chat box.
-rw-r--r--ChangeLog4
-rw-r--r--src/gui/chat.cpp10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e5e5e549..76e6ecea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-14 Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+ * src/gui/chat.cpp: Fixed up and down arrows in chat box.
+
2007-11-13 Eugenio Favalli <elvenprogrammer@gmail.com>
* data/maps/new_1-1.tmx, data/maps/new_10-1.tmx,
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index de47c8a9..2fd68c71 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -25,19 +25,19 @@
#include <sstream>
#include <guichan/focushandler.hpp>
-#include <guichan/key.hpp>
#include "chat.h"
#include "browserbox.h"
-#include "../channelmanager.h"
-#include "../channel.h"
#include "chatinput.h"
#include "gccontainer.h"
#include "scrollarea.h"
+#include "sdlinput.h"
#include "tabbedcontainer.h"
#include "windowcontainer.h"
+#include "../channelmanager.h"
+#include "../channel.h"
#include "../game.h"
#include "../localplayer.h"
@@ -507,7 +507,7 @@ ChatWindow::sendToChannel(short channelId, std::string user, std::string msg)
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
@@ -520,7 +520,7 @@ 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