From f7f68dbf94f9da14863f155d88cdaec47352ba99 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 24 七月 2024 10:28:02 +0800
Subject: [PATCH] update

---
 jrj/project/business/Public/GroupManagerList.cpp |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/jrj/project/business/Public/GroupManagerList.cpp b/jrj/project/business/Public/GroupManagerList.cpp
index bb5c66c..adc6cff 100644
--- a/jrj/project/business/Public/GroupManagerList.cpp
+++ b/jrj/project/business/Public/GroupManagerList.cpp
@@ -1,6 +1,8 @@
 #include <wobject/xstring.hpp>
 #include <xcontrol/xtreeview.hpp>
 #include <xcontrol/xdwgrid.hpp>
+#include <xcontrol/xcell.hpp>
+
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
@@ -58,9 +60,10 @@
 			if (s > 0)
 				for (i = 0; i < s; i++)
 				{
+				
 					KXMLDOMElement e = nlist.item(i);
 					xstring name = e.selectSingleNode(L"@name").text();
-					HTREEITEM hw = xtreeview::InsertChildItem(wid, h, name,e , 15);
+					HTREEITEM hw = tv_folder.InsertChildItem(h, name,e , 15);
 					createSubTree(wid, hw, e);
 				}
 			return 1;
@@ -68,9 +71,9 @@
 
 		int OnCreateTree()
 		{
-			int wid = tv_folder.GetId();
-			while (xtreeview::GetRootItem(wid) > 0)
-				xtreeview::DeleteItem(wid, xtreeview::GetRootItem(wid));
+			//int wid = tv_folder.GetId();
+			while (!tv_folder.GetRootItem())
+				tv_folder.DeleteItem(tv_folder.GetRootItem());
 
 			xml x;
 			x;
@@ -92,11 +95,11 @@
 				{
 					KXMLDOMElement e = nlist.item(i);
 					xstring name = e.selectSingleNode(L"@name").text();
-					int h = xtreeview::InsertChildItem(wid, 0, name, trust(e as int), 15);
-					createSubTree(wid, h, e);
-					xtreeview::ExpandItem(wid, h);
+					HTREEITEM h = tv_folder.InsertChildItem(0,  name, e, 15);
+					createSubTree(0,h, e);
+					tv_folder.ExpandItem(h);
 				}
-				xtreeview::ExpandItem(wid, 0);
+				tv_folder.ExpandItem( 0);
 			}
 
 			return 1;
@@ -109,7 +112,7 @@
 			NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
 			HTREEITEM hItem = nmtv.itemNew.hItem;
 
-			KXMLDOMElement e = xtreeview::GetItemData(tv_folder.GetId(), sItem);
+			KXMLDOMElement e = tv_folder.GetItemData(hItem);
 			xstring UserGroupID = e.selectSingleNode(L"@guid").text();
 			OnRetrieve(UserGroupID);
 			return 1;
@@ -130,7 +133,7 @@
 			if (comdid == L"xmMemberAdd")
 			{
 				HTREEITEM hItem = tv_folder.GetSelectedItem();
-				if (hItem < 0) return 1;
+				if (!hItem) return 1;
 				KXMLDOMElement e = tv_folder.GetItemData(hItem);
 
 				xaserverarg arg;
@@ -200,6 +203,7 @@
 			//获取焦点事件,用于重置工具条
 			AttachEvent(L"WM_SETFOCUS", (FEvent)&GroupManagerList::OnSetFocus);
 			AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&GroupManagerList::OnTreeSelChanged); //树选择
+			return 1;
 		}
 
 

--
Gitblit v1.9.3