From aa966512d0b4bc7fe9df2b0c5a38413db0ed3e4c Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 03 七月 2024 23:12:40 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index cb39487..7d3007d 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -406,13 +406,13 @@
return 1;
}
- virtual int PreOnCmdDispatch(string comdid)
+ virtual int PreOnCmdDispatch(xstring comdid)
{
//返回0——不在执行以下代码；返回其他——执行以下代码。
return 1;
}
- virtual int PostOnCmdDispatch(string comdid)
+ virtual int PostOnCmdDispatch(xstring comdid)
{
// trace("test");
return 1;
@@ -768,7 +768,7 @@
KXMLDOMElement e = n;
//trace("m_configDoc//list/dwview[@type='dwgrid'][1]="+e.xml);
xstring vface = m_configDoc.selectSingleNode(L"//vface[1]").text();
- xstring dwname = L"";//e.selectsingleNode("@name").text;
+ string dwname = L"";//e.selectsingleNode("@name").text;
xstring tpl = GetTemplateUrl();//e.selectsingleNode("@url").text;
xstring selectmode = L"4";
if (e.selectSingleNode(L"@name")) dwname = e.selectSingleNode(L"@name").text();
--
Gitblit v1.9.3