From 1daa0565659d38b74b24815a986df000fb97a2bf Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 13:19:29 +0800
Subject: [PATCH] uodate start menu

---
 jrj/project/vindexmenu.cpp |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 6846501..de87d5f 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -50,7 +50,7 @@
 		return 1;
 	}
 
-	int OnActive(TEvent* evt,int p)
+	int OnActive(TEvent* evt, LPARAM p)
 	{
 		int WA_INACTIVE   =  0;
 		int WA_ACTIVE     =  1;
@@ -97,7 +97,7 @@
 		return  cbx_panelName.GetCurSel();
 	}
 	
-	int createTree(string id, HTREEITEM parentItem)
+	int createTree(xstring id, HTREEITEM parentItem)
 	{	
 		if(tv_menu.GetChildItem(parentItem)) return 0;
 		KXMLDOMDocument x;
@@ -119,11 +119,11 @@
 			xitem= li.item(s - i - 1);
 			string xid = xitem.selectSingleNode(L"id").text();
 			string Name=xitem.selectSingleNode(L"name").text();
-			string image = L"15";
+			xstring image = L"15";
 			if(xitem.selectSingleNode(L"image")) image=xitem.selectSingleNode(L"image").text();
 			HTREEITEM hBeforItem = 0;
-			HTREEITEM curItem=tv_menu.InsertItem(parentItem,hBeforItem,Name,(LPARAM)xid,xstring(image).toInt());		
-			string child=xitem.selectSingleNode(L"@child").text();//item.getAttribute("HasChild");	
+			HTREEITEM curItem=tv_menu.InsertItem(parentItem,hBeforItem,Name,(LPARAM)xid, xstring(image).toInt());
+			xstring child=xitem.selectSingleNode(L"@child").text();//item.getAttribute("HasChild");	
 			if ((xstring)child != L"0")
 				tv_menu.SetItemChild1(curItem,1);
 		}
@@ -179,7 +179,7 @@
 		return 1;
 	}		
 
-	bool rClick(string str)
+	bool rClick(xstring str)
 	{
 		HMENU m = CreatePopupMenu();
 		int MF_STRING = 0x00000000;
@@ -202,7 +202,7 @@
 		int ret = rClick(L"鏀惰棌鑿滃崟");
 		if(ret == 1)
 		{
-			string id = (string)tv_menu.GetItemData(hItem);
+			xstring id = (xstring)tv_menu.GetItemData(hItem);
 			KXMLDOMDocument x;
 			xaserverarg arg;
 			arg.AddArg(L"id",id);
@@ -221,8 +221,8 @@
 	int dbClick(xtreeview& tid, HTREEITEM hItem)
 	{
 		HCURSOR hCursor = xutil::SetCursorWait();
-		string id = (string)tid.GetItemData(hItem);
-		string label = tid.GetItemLabel(hItem);
+		xstring id = (string)tid.GetItemData(hItem);
+		xstring label = tid.GetItemLabel(hItem);
 		KXMLDOMDocument x;
 		xaserverarg* arg = new xaserverarg();
 		arg->AddArg(L"id",id);
@@ -238,7 +238,7 @@
 		int nIndex =cbx_menu.FindString(label);
 		if(e.selectSingleNode(L"ModuelMore") && nIndex > - 1)
 		{
-			string mo = e.selectSingleNode(L"ModuelMore").text();
+			xstring mo = e.selectSingleNode(L"ModuelMore").text();
 			if((xstring)mo != L"Y")
 			{
 				xstring comd = L"changesheet:"+xstring(nIndex);
@@ -267,8 +267,8 @@
 			for (i=0;i<s;i++)
 			{
 				xitem= li.item(i);
-				string name = xitem.selectSingleNode(L"@name").text();
-				string value=xitem.selectSingleNode(L"@value").text();
+				xstring name = xitem.selectSingleNode(L"@name").text();
+				xstring value=xitem.selectSingleNode(L"@value").text();
 				arg->AddArg(name, value);
 			}
 		}
@@ -296,7 +296,7 @@
 		int no = GetCurPanel();
 		xnode anode(GetAgentNode(L"mainmemu"));
 		int p =0;
-		string id=nullptr;
+		xstring id;
 		int h = cbx_panelNo.FindString(xstring(no).c_str());
 		if(h < 0)
 		{
@@ -308,8 +308,8 @@
 				LPARAM pa = cbx_panelName.GetItemData(i);
 				if (!pa)return 1;
 				KXMLDOMElement hData = pa;
-				string Name= hData.selectSingleNode(L"name").text();
-				string Image = L"15";
+				xstring Name= hData.selectSingleNode(L"name").text();
+				xstring Image = L"15";
 				if(hData.selectSingleNode(L"image")) Image=hData.selectSingleNode(L"image").text();
 				xstring str = (xstring)L"<xtoolbutton image='"+Image+L"' caption='"+Name+L"' height='24' name='xmPanel:"+xstring(i).c_str() + L"' style='background-color:none #ceecce none #ffffff;text-align:left'/>";
 				if(i == no)
@@ -369,7 +369,7 @@
 		
 	int OnMenuAgent()
 	{
-		string s = L"menuAgent:Y";
+		xstring s = L"menuAgent:Y";
 		SendMessage(m_nHwnd, 0x401, (LPARAM)s, 0);
 		OnHideWin();
 		return 1;
@@ -428,7 +428,7 @@
 		int ret = rClick(L"鍙栨秷鏀惰棌");
 		if(ret == 1)
 		{
-			string id = (string)tv_menu1.GetItemData(hItem);
+			xstring id = (xstring)tv_menu1.GetItemData(hItem);
 			KXMLDOMDocument x;
 			xaserverarg arg;
 			arg.AddArg(L"id",id);

--
Gitblit v1.9.3