diff options
Diffstat (limited to 'src/guichan/widget.cpp')
-rw-r--r-- | src/guichan/widget.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp index 8fa7cf65a..95e026d98 100644 --- a/src/guichan/widget.cpp +++ b/src/guichan/widget.cpp @@ -52,7 +52,6 @@ #include "guichan/actionlistener.hpp" #include "guichan/basiccontainer.hpp" #include "guichan/deathlistener.hpp" -#include "guichan/defaultfont.hpp" #include "guichan/event.hpp" #include "guichan/exception.hpp" #include "guichan/focushandler.hpp" @@ -68,7 +67,6 @@ namespace gcn { Font* Widget::mGlobalFont = nullptr; - DefaultFont Widget::mDefaultFont; std::list<Widget*> Widget::mWidgets; std::set<Widget*> Widget::mWidgetsSet; @@ -445,13 +443,7 @@ namespace gcn Font* Widget::getFont() const { if (!mCurrentFont) - { - if (!mGlobalFont) - return &mDefaultFont; - return mGlobalFont; - } - return mCurrentFont; } |