diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-05-05 22:30:25 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-05-05 22:30:25 +0200 |
| commit | 6decbb6227bdb72327273e9e607f58f6bff5fd5c (patch) | |
| tree | de8da137ad5a88eb3f6c81575313946bc2ab394c /src/gui | |
| parent | df9ed1ab4364fe29bf260cae51827cc2722eff78 (diff) | |
| parent | 86154175f63a7f1a4b73b3727314ac760d83834e (diff) | |
| download | mana-6decbb6227bdb72327273e9e607f58f6bff5fd5c.tar.gz mana-6decbb6227bdb72327273e9e607f58f6bff5fd5c.tar.bz2 mana-6decbb6227bdb72327273e9e607f58f6bff5fd5c.tar.xz mana-6decbb6227bdb72327273e9e607f58f6bff5fd5c.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/tabbedarea.h | 3 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 45b092a4..b43078a4 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -98,7 +98,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener int getContainerHeight() const { return mWidgetContainer->getHeight(); } - using gcn::TabbedArea::setSelectedTab; + void setSelectedTab(unsigned int index) + { gcn::TabbedArea::setSelectedTab(index); } void setSelectedTab(gcn::Tab *tab); diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 28654032..94cada41 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -63,6 +63,7 @@ struct TextHistory { class AutoCompleteLister { public: + virtual ~AutoCompleteLister() {} virtual void getAutoCompleteList(std::vector<std::string>&) const {} }; |