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/Enquiry/Entity.Product.Select.cpp | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index aa09eeb..499ca5b 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);
}
@@ -1117,7 +1117,6 @@
else
g_xdoc_shoppingcart.Retrieve(ShoppingCartView::GetGoodsList(selectname, queryString));
}
- dwc_list.PostRetrieve();
dwc_list.Redraw();
if (dwc_list.GetRowCount() >= 1)
@@ -1253,12 +1252,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);
}
@@ -1428,7 +1427,7 @@
hObject = 0;
if (arg)
{
- hObject = arg.GetArgString(L"HWND").toInt();
+ hObject = (HWND)arg.GetParam(L"HWND");
CustomerID = arg.GetArgString(L"CustomerID");
CustomerID = arg.GetArgString(L"SupplierID");
}
--
Gitblit v1.9.3