Updated to SFML 2.4

Author: abodelot

src/Gui/Label.cpp

@@ -8,7 +8,7 @@ Label::Label(const sf::String& string)
 {
 	m_text.setFont(Theme::getFont());
 	m_text.setPosition(Theme::PADDING, Theme::PADDING);
-	m_text.setColor(Theme::click.textColor);
+	m_text.setFillColor(Theme::click.textColor);
 	m_text.setCharacterSize(Theme::textSize);
 	setSelectable(false);
 	setText(string);
@@ -28,15 +28,15 @@ const sf::String& Label::getText() const
 }
 
 
-void Label::setColor(const sf::Color& color)
+void Label::setFillColor(const sf::Color& color)
 {
-	m_text.setColor(color);
+	m_text.setFillColor(color);
 }
 
 
-const sf::Color& Label::getColor() const
+const sf::Color& Label::getFillColor() const
 {
-	return m_text.getColor();
+	return m_text.getFillColor();
 }
 
 

src/Gui/Label.hpp

@@ -25,8 +25,8 @@ class Label: public Widget
 	/**
 	 * Label's color
 	 */
-	void setColor(const sf::Color& color);
-	const sf::Color& getColor() const;
+	void setFillColor(const sf::Color& color);
+	const sf::Color& getFillColor() const;
 
 	void setTextSize(size_t size);
 	size_t getTextSize() const;

src/Gui/OptionsBox.hpp

@@ -23,7 +23,7 @@ class OptionsBox: public Widget
 	 * @param label: displayed label when selected
 	 * @param value: value associated
 	 */
-	void addItem(const sf::String& label, const T& value, bool select = false);
+	void addItem(const sf::String& label, const T& value);
 
 	/**
 	 * Make an item the current one

src/Gui/OptionsBox.inl

@@ -30,7 +30,7 @@ OptionsBox<T>::OptionsBox():
 
 
 template <class T>
-void OptionsBox<T>::addItem(const sf::String& label, const T& value, bool select)
+void OptionsBox<T>::addItem(const sf::String& label, const T& value)
 {
 	m_items.push_back(Item(label, value));
 

src/Gui/ProgressBar.cpp

@@ -12,7 +12,7 @@ ProgressBar::ProgressBar(float width):
 {
 	m_box.setSize(width, Theme::getBoxHeight());
 	m_text.setFont(Theme::getFont());
-	m_text.setColor(Theme::input.textColor);
+	m_text.setFillColor(Theme::input.textColor);
 	m_text.setCharacterSize(Theme::textSize);
 
 	// Build bar

src/Gui/Slider.cpp

@@ -183,7 +183,7 @@ void Slider::onMouseMoved(float x, float y)
 }
 
 
-void Slider::onMouseReleased(float x, float y)
+void Slider::onMouseReleased(float, float)
 {
 	m_handle.release();
 }

src/Gui/TextBox.cpp

@@ -18,7 +18,7 @@ TextBox::TextBox(float width):
 	int offset = Theme::borderSize + Theme::PADDING;
 	m_text.setFont(Theme::getFont());
 	m_text.setPosition(offset, offset);
-	m_text.setColor(Theme::input.textColor);
+	m_text.setFillColor(Theme::input.textColor);
 	m_text.setCharacterSize(Theme::textSize);
 
 	// Build cursor
@@ -149,7 +149,7 @@ void TextBox::onKeyPressed(sf::Keyboard::Key key)
 }
 
 
-void TextBox::onMousePressed(float x, float y)
+void TextBox::onMousePressed(float x, float)
 {
 	for (int i = m_text.getString().getSize(); i >= 0; --i)
 	{

src/Gui/Utils/Arrow.cpp

@@ -17,7 +17,7 @@ Arrow::Arrow(Direction direction):
 }
 
 
-void Arrow::setColor(const sf::Color& color)
+void Arrow::setFillColor(const sf::Color& color)
 {
 	for (int i = 0; i < 4; ++i)
 		m_vertices[i].color = color;

src/Gui/Utils/Arrow.hpp

@@ -13,7 +13,7 @@ class Arrow: public sf::Drawable
 
 	Arrow(Direction direction);
 
-	void setColor(const sf::Color& color);
+	void setFillColor(const sf::Color& color);
 
 	void move(float dx, float dy);
 	void setPosition(float x, float y);

src/Gui/Utils/Cross.cpp

@@ -32,7 +32,7 @@ void Cross::move(float dx, float dy)
 }
 
 
-void Cross::setSize(float size)
+void Cross::setSize(float)
 {
 
 }

src/Gui/Utils/ItemBox.inl

@@ -26,14 +26,14 @@ void ItemBox<T>::applyState(State state)
 	switch (state)
 	{
 		case StateDefault:
-			m_item.setColor(m_type == Click ? Theme::click.textColor : Theme::input.textColor);
+			m_item.setFillColor(m_type == Click ? Theme::click.textColor : Theme::input.textColor);
 			break;
 		case StateHovered:
-			m_item.setColor(m_type == Click ? Theme::click.textColorHover : Theme::input.textColorHover);
+			m_item.setFillColor(m_type == Click ? Theme::click.textColorHover : Theme::input.textColorHover);
 			break;
 		case StatePressed:
 		case StateFocused:
-			m_item.setColor(m_type == Click ? Theme::click.textColorFocus : Theme::input.textColorFocus);
+			m_item.setFillColor(m_type == Click ? Theme::click.textColorFocus : Theme::input.textColorFocus);
 			break;
 
 	}

src/demo.cpp

@@ -149,7 +149,7 @@ int main()
 					text.setOrigin(text.getLocalBounds().width / 2, text.getLocalBounds().height / 2);
 					break;
 				case C_COLOR:
-					text.setColor(opt->getSelectedValue());
+					text.setFillColor(opt->getSelectedValue());
 					break;
 				case C_ROTATION:
 					text.setRotation(sliderRotation->getValue() * 360 / 100.f);