From a6b54d999992d72b2d9ea33efec0b7d642ea9f2d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 12:21:12 +0800
Subject: [PATCH] update
---
jrj/project/business/BasicCode/Simple.Menu.Config.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/jrj/project/business/BasicCode/Simple.Menu.Config.cpp b/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
index d201903..7ab5ac8 100644
--- a/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
+++ b/jrj/project/business/BasicCode/Simple.Menu.Config.cpp
@@ -81,13 +81,12 @@
dw_list.ResetUpdateStatus();
dw_list.DwUpdateAllToEx(x);
HTREEITEM hItem =tv_gs.GetSelectedItem();
- if(hItem > 0)
+ if(hItem)
{
KXMLDOMElement e = x.documentElement();
- int p = trust(e);
- tv_gs.SetItemData(hItem, p);
+ tv_gs.SetItemData(hItem, e);
- while(tv_gs.GetChildItem( hItem) > 0)
+ while(tv_gs.GetChildItem( hItem))
tv_gs.DeleteItem(tv_gs.GetChildItem( hItem));
KXMLDOMNodeList li = x.selectNodes(L"item/item");
@@ -95,9 +94,8 @@
for(i=0;i<s;i++)
{
KXMLDOMElement ele = li.item(i);
- int pa = trust(ele);
xstring name = ele.selectSingleNode(L"Name").text();
- HTREEITEM cItem =tv_gs.InsertChildItem( hItem, name, pa, 15);
+ HTREEITEM cItem =tv_gs.InsertChildItem( hItem, name, ele, 15);
if(ele.selectSingleNode(L"item"))
tv_gs.SetItemChild1(cItem, 1);
}
@@ -182,7 +180,7 @@
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
HTREEITEM hItem = nmtv.itemNew.hItem;
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_gs.GetItemData(hItem);
+ KXMLDOMElement e = tv_gs.GetItemData(hItem);
//trace(L"%s", e.xml);
//xstring id = e.selectSingleNode(L"MenuID").text();
dw_list.AcceptText();
@@ -204,9 +202,9 @@
tv_gs.DeleteItem(xto);
return -1;
}
- KXMLDOMElement& fid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
+ KXMLDOMElement fid = tv_gs.GetItemData(xto);
HTREEITEM xpto =tv_gs.GetParentItem(xto);
- KXMLDOMElement& tid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
+ KXMLDOMElement tid = tv_gs.GetItemData(xto);
//trace(L"%s-------------------------%s",fid.xml,tid.xml);
xml x ;
@@ -231,7 +229,7 @@
//
HTREEITEM xpfrom =tv_gs.GetParentItem(xfrom);
//trace(L"%d", xpfrom);
- KXMLDOMElement& fe = *(KXMLDOMElement*)tv_gs.GetItemData(xpfrom);
+ KXMLDOMElement fe = tv_gs.GetItemData(xpfrom);
//trace(L"%s-------------------------%s",fe.xml,tid.xml);
KXMLDOMElement fe1 = fe.selectSingleNode(L"item[@guid='"+id1+L"']");
fe.removeChild(fe1);
--
Gitblit v1.9.3