diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-05-05 18:12:36 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-05-05 22:26:32 +0200 |
| commit | 86154175f63a7f1a4b73b3727314ac760d83834e (patch) | |
| tree | 5507b93f5ef8f4cb01b46233050230f9d12f9ef5 /src/gui | |
| parent | c32c1746b43f3f7869bbbf3c86533bf5a5d57a29 (diff) | |
| download | mana-86154175f63a7f1a4b73b3727314ac760d83834e.tar.gz mana-86154175f63a7f1a4b73b3727314ac760d83834e.tar.bz2 mana-86154175f63a7f1a4b73b3727314ac760d83834e.tar.xz mana-86154175f63a7f1a4b73b3727314ac760d83834e.zip | |
Fixed compilation errors and warnings with GCC 4.7
Also, since GCC 4.7 there is a binary compatibility issue when linking with a
Guichan that was not compiled in C++11 mode. This commit also allows compiling
with GCC 4.7 with C++11 mode turned off.
Reviewed-by: Erik Schilling
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 {} }; |