diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 15:15:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-19 16:39:56 +0300 |
commit | 10badd2c0e099c7611f6d23b3973e54f210bc172 (patch) | |
tree | 3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/widgets/tab.cpp | |
parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
download | manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/widgets/tab.cpp')
-rw-r--r-- | src/gui/widgets/tab.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index af3a18560..b6133af0e 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -36,8 +36,6 @@ #include "utils/dtor.h" -#include <guichan/widgets/label.hpp> - #include "debug.h" int Tab::mInstances = 0; @@ -66,11 +64,9 @@ Tab::Tab() : gcn::BasicContainer(), gcn::MouseListener(), gcn::WidgetListener(), - mLabel(new Label), mHasMouse(false), mTabbedArea(nullptr), - mTabColor(&Theme::getThemeColor(Theme::TAB)), mTabHighlightedColor(&Theme::getThemeColor(Theme::TAB_HIGHLIGHTED)), mTabSelectedColor(&Theme::getThemeColor(Theme::TAB_SELECTED)), |