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/widgets/window.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/widgets/window.cpp')
| -rw-r--r-- | src/gui/widgets/window.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c250e79a1..e2f24a0f2 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -29,6 +29,7 @@ #include "soundconsts.h" #include "soundmanager.h" +#include "gui/font.h" #include "gui/gui.h" #include "gui/viewport.h" @@ -38,7 +39,6 @@ #include "resources/image.h" #include "gui/base/focushandler.hpp" -#include "gui/base/font.hpp" #include "debug.h" @@ -110,7 +110,7 @@ Window::Window(const std::string &caption, const bool modal, { setPadding(mSkin->getPadding()); if (getOptionBool("titlebarBold")) - mCaptionFont = reinterpret_cast<gcn::Font*>(boldFont); + mCaptionFont = boldFont; mTitlePadding = mSkin->getTitlePadding(); mGripPadding = getOption("resizePadding"); mCaptionOffsetX = getOption("captionoffsetx"); |