From 26c872c4c2c1e56925f755e927b58fbe07da2bcb Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 13:56:44 +0800
Subject: [PATCH] update quote

---
 jrj/project/business/Enquiry/Entity.Product.Select.cpp |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 89250b3..35f0d4e 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -63,7 +63,7 @@
 			{
 				KXMLDOMElement e = nlist.item(i);
 				xstring name = e.getAttribute(L"name");
-				xcombobox::AddItem(xc.GetId(), name);
+				xcombobox::AddItem(xc.GetHWND(), name);
 			}
 			return 1;
 		}
@@ -100,7 +100,7 @@
 		KXMLDOMElement OnGetCarListRowElement(int row = 0)
 		{
 			if (row < 1) row = dwc_list.GetRow();
-			if (row < 1 || row > dwc_list.GetRowCount()) return 0;
+			if (row < 1 || row > dwc_list.GetRowCount()) return KXMLDOMElement();
 			KXMLDOMElement e = g_xdoc_shoppingcart.getRowElement(L"data/Item", row);
 			return e;
 		}
@@ -902,12 +902,12 @@
 			int len = nlist.length();
 			for (int i = 0; i < len; i++)
 			{
-				KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+				KXMLDOMElement e = nlist.item(i);
 				xstring name = e.getAttribute(L"CName");
 				xstring no = e.getAttribute(L"CategoryNo");
 				xstring label = no.trim() + L" " + name;
 
-				HTREEITEM h = tv_folder.InsertChildItem(hItem, label, (LPARAM)&e, 15);
+				HTREEITEM h = tv_folder.InsertChildItem(hItem, label, e, 15);
 				xstring child = e.getAttribute(L"Childs");
 				if (child == L"")
 					tv_folder.SetItemChild(h, 1);
@@ -927,12 +927,12 @@
 			int len = nlist.length();
 			for (int i = 0; i < len; i++)
 			{
-				KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+				KXMLDOMElement e = nlist.item(i);
 				xstring name = e.getAttribute(L"CName");
 				xstring no = e.getAttribute(L"CategoryNo");
 				xstring label = no.trim() + L" " + name;
 
-				HTREEITEM h = tv_folder.InsertChildItem(hItem, label, (LPARAM)&e, 15);
+				HTREEITEM h = tv_folder.InsertChildItem(hItem, label, e, 15);
 				xstring child = e.getAttribute(L"Childs");
 				if (child == L"")
 					tv_folder.SetItemChild(h, 1);
@@ -950,9 +950,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);
 				xstring name = e.getAttribute(L"name");
-				HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+				HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
 				ExpandCatChildFolder(h, e, 35);
 			}
 			return 1;
@@ -965,9 +965,9 @@
 			int len = nlist.length();
 			for (int i = 0; i < len; i++)
 			{
-				KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+				KXMLDOMElement e = nlist.item(i);
 				xstring name = e.getAttribute(L"name");
-				HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
+				HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, 35);
 				ExpandCatChildFolder(h, e, 35);
 			}
 			return 1;
@@ -1031,7 +1031,7 @@
 		{
 			while (true)
 			{
-				KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+				KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
 				xstring str = e1.getAttribute(L"no");
 				if (str.find(L"Customer:") >= 0) return hItem;
 				hItem = tv_folder.GetParentItem(hItem);
@@ -1044,7 +1044,7 @@
 		{
 			hItem = LookupCustomerFolder(hItem);
 			if (hItem == 0) return L"";
-			KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+			KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
 			xstring str = e1.getAttribute(L"no");
 			return str.mid(xstring(L"Customer:").length(), 9999);
 		}
@@ -1253,12 +1253,12 @@
 			int len = nlist.length();
 			for (int i = 0; i < len; i++)
 			{
-				KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+				KXMLDOMElement e = nlist.item(i);
 				xstring name = e.getAttribute(L"cname");
 				xstring sImage = e.getAttribute(L"image");
 				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, image);
 				tv_folder.SetItemChild(h, 1);
 				ExpandChildFolder(h, e);
 			}

--
Gitblit v1.9.3