From 721270c5a92954f2543250beaa3871dd95bd408c Mon Sep 17 00:00:00 2001 From: Benau Date: Wed, 14 Nov 2018 15:03:33 +0800 Subject: [PATCH] Fix #3566 --- src/guiengine/widgets/icon_button_widget.cpp | 5 ----- src/guiengine/widgets/icon_button_widget.hpp | 2 -- src/states_screens/online/networking_lobby.cpp | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp index edd89f397..58a32264c 100644 --- a/src/guiengine/widgets/icon_button_widget.cpp +++ b/src/guiengine/widgets/icon_button_widget.cpp @@ -434,8 +434,3 @@ void IconButtonWidget::setVisible(bool visible) m_label->setVisible(visible); } -// ----------------------------------------------------------------------------- -void IconButtonWidget::setText(const wchar_t *s) -{ - m_label->setText(s); -} diff --git a/src/guiengine/widgets/icon_button_widget.hpp b/src/guiengine/widgets/icon_button_widget.hpp index 4c56ca55f..5580195f5 100644 --- a/src/guiengine/widgets/icon_button_widget.hpp +++ b/src/guiengine/widgets/icon_button_widget.hpp @@ -170,8 +170,6 @@ namespace GUIEngine Widget::elementRemoved(); m_label = NULL; } - // -------------------------------------------------------------------- - virtual void setText(const wchar_t *s) OVERRIDE; }; } diff --git a/src/states_screens/online/networking_lobby.cpp b/src/states_screens/online/networking_lobby.cpp index 7314b9533..95a6e0508 100644 --- a/src/states_screens/online/networking_lobby.cpp +++ b/src/states_screens/online/networking_lobby.cpp @@ -152,7 +152,7 @@ void NetworkingLobby::init() //I18N: In the networking lobby m_header->setText(_("Lobby"), false); m_server_info_height = GUIEngine::getFont()->getDimension(L"X").Height; - m_start_button->setText(_("Start race")); + m_start_button->setLabel(_("Start race")); m_start_button->setVisible(false); m_state = LS_CONNECTING; getWidget("chat")->setVisible(false); @@ -578,7 +578,7 @@ void NetworkingLobby::initAutoStartTimer(bool grand_prix_started, //I18N: In the networking lobby, ready button is to allow player to tell //server that he is ready for next game for owner less server - m_start_button->setText(_("Ready")); + m_start_button->setLabel(_("Ready")); m_has_auto_start_in_server = true; m_min_start_game_players = grand_prix_started ? 0 : min_players; m_start_timeout = start_timeout;