From eb39d3d2ca26581f9f0254acd0b1f5d56c9869a8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 11:19:29 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 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 8da9fdb..6846501 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:
@@ -56,7 +56,7 @@
 		int WA_ACTIVE     =  1;
 		int WA_CLICKACTIVE = 2;
 		int SW_HIDE=0x1;
-		WPARAM lw = evt->wParam & 0xffff;
+		WPARAM lw = evt->wParam;
 		int x = m_bCanDestroy;
 		if( lw ==WA_INACTIVE && x==1 )
 		{
@@ -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;
 	}		
@@ -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