From de4c5b12eb264c9a5b8244fac8cea25e01be18be Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 26 六月 2024 18:34:05 +0800
Subject: [PATCH] update folder data item

---
 jrj/project/business/SO3.list.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index f5af146..0ce958f 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -46,9 +46,9 @@
 		if (len > 0) tv_folder.SetItemChild(hItem, 1);
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = * new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			string name = e.getAttribute(L"name");
-			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e.ptr(), image);
 			ExpandCatChildFolder(h, e, 35);
 		}
 		return 1;
@@ -62,9 +62,9 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			string name = e.getAttribute(L"name");
-			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
+			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e.ptr(), 35);
 			ExpandCatChildFolder(h, e, 35);
 		}
 		return 1;
@@ -79,7 +79,7 @@
 		string name = tv_folder.GetItemLabel(hTopItem);
 		HTREEITEM child = tv_folder.GetChildItem(hItem);
 
-		KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+		KXMLDOMElement e = tv_folder.GetItemData(hItem);
 		if (!child)ExpandFolderItem(hItem, e.getAttribute(L"no"));
 
 		return 1;
@@ -92,15 +92,15 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			string name = e.getAttribute(L"name");
 			xstring sImage = e.getAttribute(L"image");
 			xstring child = e.getAttribute(L"child");
 			int image = 15;
 			if (sImage) image = sImage.toInt();
-			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+			HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e.ptr(), image);
 			if (child != L"no") tv_folder.SetItemChild(h, 1);
-			ExpandChildFolder(h, e);
+			//ExpandChildFolder(h, e);
 		}
 		return 1;
 	}
@@ -170,7 +170,7 @@
 		if (!hItem) return 1;
 
 		HCURSOR hCursor = xutil::SetCursorWait();
-		KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+		KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
 		string no = e1.getAttribute(L"no");
 		KXMLDOMDocument x = ViewObject::RetrieveData(GetServerUrl(),myDataUrl, L"no", no, L"QueryTxt", m_QueryTxt, L"rows", rows);
 		if (x)
@@ -499,7 +499,7 @@
 	{
 		HTREEITEM hItem = tv_folder.GetCaretItem();
 		if (hItem ) return 1;
-		KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+		KXMLDOMElement e =  tv_folder.GetItemData(hItem);
 		xstring  no = e.getAttribute(L"no");
 		if (no.find(L"Customer:") >= 0)
 		{

--
Gitblit v1.9.3