summaryrefslogtreecommitdiff
path: root/src/gui/widgets/textfield.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/widgets/textfield.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/gui/widgets/textfield.cpp')
-rw-r--r--src/gui/widgets/textfield.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 0d01df51d..4dd2f1c7b 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -28,8 +28,8 @@
#include "events/keyevent.h"
+#include "gui/font.h"
#include "gui/sdlinput.h"
-
#include "gui/viewport.h"
#include "gui/popups/popupmenu.h"
@@ -39,8 +39,6 @@
#include "utils/copynpaste.h"
#include "utils/timer.h"
-#include "gui/base/font.hpp"
-
#undef DELETE // Win32 compatibility hack
#include "debug.h"
@@ -142,7 +140,7 @@ void TextField::draw(Graphics *graphics)
BLOCK_START("TextField::draw")
updateAlpha();
- gcn::Font *const font = getFont();
+ Font *const font = getFont();
if (isFocused())
{
drawCaret(graphics,