From 86154175f63a7f1a4b73b3727314ac760d83834e Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 5 May 2012 18:12:36 +0200 Subject: 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 --- src/gui/widgets/tabbedarea.h | 3 ++- src/gui/widgets/textfield.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui') 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&) const {} }; -- cgit v1.2.3-70-g09d2