From 183ca37b1e44f3efeb03cc0b2d9e5c02d1665f58 Mon Sep 17 00:00:00 2001 From: Inky Date: Tue, 30 Apr 2019 22:27:11 +0300 Subject: [PATCH] Backed out changeset 879f41335e4d --HG-- branch : develop --- code/nel/include/nel/gui/group_menu.h | 5 ---- code/nel/src/gui/group_menu.cpp | 36 --------------------------- 2 files changed, 41 deletions(-) diff --git a/code/nel/include/nel/gui/group_menu.h b/code/nel/include/nel/gui/group_menu.h index ecdd8aff0..cfe91f7f9 100644 --- a/code/nel/include/nel/gui/group_menu.h +++ b/code/nel/include/nel/gui/group_menu.h @@ -137,9 +137,6 @@ namespace NLGUI const std::string getActionHandler(uint lineIndex) const; const std::string getActionHandlerParam(uint lineIndex) const; - void setActionHandler(uint lineIndex, const std::string &ah = ""); - void setActionHandlerParam(uint lineIndex, const std::string ¶ms = ""); - void openSubMenu (sint32 nb); void hideSubMenus (); @@ -333,8 +330,6 @@ namespace NLGUI const std::string getActionHandler(uint lineIndex) const; const std::string getActionHandlerParam(uint lineIndex) const; - void setActionHandler(uint lineIndex, const std::string &ah = ""); - void setActionHandlerParam(uint lineIndex, const std::string ¶ms = ""); void addLine (const ucstring &name, const std::string &ah = "", const std::string ¶ms = "", const std::string &id = std::string(), diff --git a/code/nel/src/gui/group_menu.cpp b/code/nel/src/gui/group_menu.cpp index 15a655d76..d8b3452ed 100644 --- a/code/nel/src/gui/group_menu.cpp +++ b/code/nel/src/gui/group_menu.cpp @@ -1663,28 +1663,6 @@ namespace NLGUI return _Lines[lineIndex].AHParams; } - // ------------------------------------------------------------------------------------------------ - void CGroupSubMenu::setActionHandler(uint lineIndex, const std::string &ah) - { - if (lineIndex > _Lines.size()) - { - nlwarning("Bad index"); - return; - } - _Lines[lineIndex].AHName = ah; - } - - // ------------------------------------------------------------------------------------------------ - void CGroupSubMenu::setActionHandlerParam(uint lineIndex, const std::string ¶ms) - { - if (lineIndex > _Lines.size()) - { - nlwarning("Bad index"); - return; - } - _Lines[lineIndex].AHParams = params; - } - // ------------------------------------------------------------------------------------------------ void CGroupSubMenu::setSelectable(uint lineIndex, bool selectable) { @@ -2618,20 +2596,6 @@ namespace NLGUI return _RootMenu ? _RootMenu->getActionHandlerParam(lineIndex) : ""; } - // ------------------------------------------------------------------------------------------------ - void CGroupMenu::setActionHandler(uint lineIndex, const std::string &ah) - { - if (_RootMenu) - _RootMenu->setActionHandler(lineIndex, ah); - } - - // ------------------------------------------------------------------------------------------------ - void CGroupMenu::setActionHandlerParam(uint lineIndex, const std::string ¶ms) - { - if (_RootMenu) - _RootMenu->setActionHandlerParam(lineIndex, params); - } - // ------------------------------------------------------------------------------------------------ void CGroupMenu::setUserGroupRight(uint line, CInterfaceGroup *gr, bool ownerShip /*=true*/) {