summaryrefslogtreecommitdiff
path: root/src/gui/tabbedcontainer.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
commitd3385829ca6f7d52e21706b25b14fe1083cfe984 (patch)
treeaea368b2434a49864b33183f95b6aae36abef3b7 /src/gui/tabbedcontainer.h
parent7d287027babe615e01ddcf20edc1057f7d778c58 (diff)
downloadmana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz
mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2
mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz
mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.0 branch.
Diffstat (limited to 'src/gui/tabbedcontainer.h')
-rw-r--r--src/gui/tabbedcontainer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index 24c8c425..453d8374 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -43,7 +43,7 @@ class TabbedContainer : public gcn::Container, public gcn::ActionListener
void logic();
- void action(const std::string &event);
+ void action(const std::string &event, gcn::Widget *widget);
void setOpaque(bool opaque);
@@ -53,7 +53,7 @@ class TabbedContainer : public gcn::Container, public gcn::ActionListener
Widgets mTabs; // The actual tabs at the top
Widgets mContents; // The contents of the tabs
- Widget *mActiveContent;
+ gcn::Widget *mActiveContent;
};
#endif