diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-16 22:17:22 +0300 |
| commit | 6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch) | |
| tree | 562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/windows/npcdialog.cpp | |
| parent | 82ac4641828ec7387863bb18cf4493190c4cc68f (diff) | |
| download | manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2 manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz manaplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip | |
combine font classes in one.
Diffstat (limited to 'src/gui/windows/npcdialog.cpp')
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index a883406e7..d1823d5cf 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -32,8 +32,8 @@ #include "being/being.h" +#include "gui/font.h" #include "gui/gui.h" -#include "gui/sdlfont.h" #include "gui/viewport.h" #include "gui/windows/inventorywindow.h" @@ -59,8 +59,6 @@ #include "utils/copynpaste.h" #include "utils/gettext.h" -#include "gui/base/font.hpp" - #include "debug.h" // TRANSLATORS: npc dialog button @@ -170,7 +168,7 @@ NpcDialog::NpcDialog(const int npcId) : mTextField->setVisible(true); mIntField->setVisible(true); - const gcn::Font *const fnt = mButton->getFont(); + const Font *const fnt = mButton->getFont(); int width = std::max(fnt->getWidth(CAPTION_WAITING), fnt->getWidth(CAPTION_NEXT)); width = std::max(width, fnt->getWidth(CAPTION_CLOSE)); |