From 1b9911af8587beaa9e36a6acf2e2f5e146a88b80 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Fri, 22 Jun 2012 05:44:01 +0200 Subject: [PATCH] CHANGED: #1471 CGroupList no longer depends on CGroupContainer. --HG-- branch : gui-refactoring --- .../client/src/interface_v3/group_list.cpp | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/group_list.cpp b/code/ryzom/client/src/interface_v3/group_list.cpp index 43b109ac1..3db145367 100644 --- a/code/ryzom/client/src/interface_v3/group_list.cpp +++ b/code/ryzom/client/src/interface_v3/group_list.cpp @@ -14,27 +14,19 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . - - -#include "stdpch.h" - #include "group_list.h" -#include "interface_manager.h" #include "nel/gui/interface_element.h" -#include "../client_chat_manager.h" #include "nel/gui/view_bitmap.h" #include "nel/gui/view_text_id.h" -#include "group_container.h" +#include "nel/gui/group_container_base.h" #include "nel/gui/lua_ihm.h" -#include "lua_ihm_ryzom.h" - #include "nel/misc/xml_auto_ptr.h" +#include "nel/gui/widget_manager.h" +#include "nel/gui/view_pointer_base.h" using namespace std; using namespace NLMISC; -extern CClientChatManager ChatMngr; - NLMISC_REGISTER_OBJECT(CViewBase, CGroupList, std::string, "list"); // ---------------------------------------------------------------------------- @@ -571,7 +563,6 @@ void CGroupList::draw () //rVR.drawRotFlipBitmap _RenderLayer, (_XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(0, 255, 0, 255) ); if (_Over) { - CInterfaceManager *pIM = CInterfaceManager::getInstance(); CViewRenderer &rVR = *CViewRenderer::getInstance(); if (CWidgetManager::getInstance()->getModalWindow() == NULL) @@ -622,13 +613,13 @@ void CGroupList::draw () { // Find the first container CInterfaceGroup *pIG = _Parent; - CGroupContainer *pGC = dynamic_cast(pIG); + CGroupContainerBase *pGC = dynamic_cast(pIG); while (pIG != NULL) { pIG = pIG->_Parent; if (pIG == NULL) break; - if (dynamic_cast(pIG) != NULL) - pGC = dynamic_cast(pIG); + if (dynamic_cast(pIG) != NULL) + pGC = dynamic_cast(pIG); } bool bDisplayOverSelection = true;