From 4ae163e0636995f9c288f2a5a95a27a7e9c361a2 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 11 十二月 2024 16:33:31 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/devloper/XDevEditXFile.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/jrj/xframe/devloper/XDevEditXFile.cpp b/jrj/xframe/devloper/XDevEditXFile.cpp
index 8ec2265..a5e7e9d 100644
--- a/jrj/xframe/devloper/XDevEditXFile.cpp
+++ b/jrj/xframe/devloper/XDevEditXFile.cpp
@@ -181,8 +181,8 @@
xstring sType = OnGetType();
if (sType == L"xml.xsd")
{
- xstring sError;
- x.ValidSchema(content, &sError);
+ BSTR sError= nullptr;
+ x.ValidSchema((const wchar_t* )content.c_str(), sError);
trace(sError);
}
}
@@ -211,7 +211,7 @@
else if (sType == L"xml.xsd")
{
xml doc;
- x.GetSchemaXml(content,doc);
+ x.GetSchemaXml((LPTSTR)content.c_str(), doc);
//trace(doc.xml());
auto e = doc.selectSingleNode(L"root/schema");
if (e) {
@@ -244,7 +244,7 @@
{
HTREEITEM hP2Item = 0;
HTREEITEM hDomainItem = 0;
- if (tv_folder.GetParentItem(hItem) <= 0)
+ if (!tv_folder.GetParentItem(hItem))
{
hDomainItem = hItem;
}
@@ -302,7 +302,7 @@
{
xstring xsd = GetXSD(L"" + filename);
xml x;
- x.GetSchemaXml(xsd,x);
+ x.GetSchemaXml((LPTSTR)xsd.c_str(), x);
trace(x.xml());
/* xml x = new xml;
@@ -337,6 +337,8 @@
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditXFile::OnSetFocus);
AttachEvent(L"xreport",L"DWV_DOUBLECLICKED", (FEvent)&XDevEditXFile::OnDoubleClicked);
+
+ return 1;
}
int LoadData()
--
Gitblit v1.9.3