From 5328bcc143efdba5b735df2af0fdd56fd92b5f54 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 23 七月 2024 10:43:55 +0800
Subject: [PATCH] update
---
jrj/project/vindexmenu.cpp | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 612ff34..90c7c49 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -29,7 +29,7 @@
int tabNo;
//int m_panelNo; // 褰撳墠鑿滃崟缁�
- string m_Assignment;
+ xstring m_Assignment;
public:
vindexmenu(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
@@ -86,9 +86,8 @@
for (i=0;i<s;i++)
{
KXMLDOMElement xitem= li.item(i);
- void * p = new KXMLDOMElement(xitem);
int k = cbx_panelName.AddItem(xstring(i).c_str());
- cbx_panelName.SetItemData(k, (LPARAM)p);
+ cbx_panelName.SetItemData(k, xitem);
}
return 1;
}
@@ -308,7 +307,7 @@
{
LPARAM pa = cbx_panelName.GetItemData(i);
if (!pa)return 1;
- KXMLDOMElement& hData = *(KXMLDOMElement*)pa;
+ KXMLDOMElement hData = pa;
string Name= hData.selectSingleNode(L"name").text();
string Image = L"15";
if(hData.selectSingleNode(L"image")) Image=hData.selectSingleNode(L"image").text();
@@ -461,10 +460,10 @@
{
xaserverarg arg = GetArg();
m_nHwnd = (HWND)arg.GetParam(L"hwnd");
- cbx_menu = (void*)arg.GetParam(L"memuId");
- cbx_tab = (void*)arg.GetParam(L"tabNo");
- cbx_panelNo = (void*)arg.GetParam(L"panelNo");
- cbx_panelName = (void*)arg.GetParam(L"panelName");
+ cbx_menu = (void*)arg.GetParam(L"cbx_menu");
+ cbx_tab = (void*)arg.GetParam(L"cbx_tab");
+ cbx_panelNo = (void*)arg.GetParam(L"cbx_panelNo");
+ cbx_panelName = (void*)arg.GetParam(L"cbx_panelName");
xstring s = L"menuid:"+xstring((LPARAM)GetHWND());
SendMessage(m_nHwnd, 0x401, (LPARAM)s.c_str(), 0);
}
--
Gitblit v1.9.3