From e3f724c9fd36995c207a6ed173849c20aaa2e3d7 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 17 十二月 2024 13:06:22 +0800
Subject: [PATCH] update

---
 jrj/xframe/devloper/XDevEditXDV.cpp |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jrj/xframe/devloper/XDevEditXDV.cpp b/jrj/xframe/devloper/XDevEditXDV.cpp
index 621b492..21c9279 100644
--- a/jrj/xframe/devloper/XDevEditXDV.cpp
+++ b/jrj/xframe/devloper/XDevEditXDV.cpp
@@ -7,12 +7,13 @@
 #include <xcontrol/xdwgrid.hpp>
 #include <xcontrol/xsedit.hpp>
 #include <xcontrol/xcombobox.hpp>
+#include "XDevEditPage.hpp"
 
 using xml = KXMLDOMDocument;
-class export XDevEditXDV : public xwin
+class export XDevEditXDV : public XDevEditPage
 {
 	public:
-	XDevEditXDV(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	XDevEditXDV(void* implPtr, HWND hWnd) :XDevEditPage(implPtr, hWnd) {}
 public:
 	static XDevEditXDV* CreateInstance(void* implPtr, void* hWnd)
 	{
@@ -20,8 +21,9 @@
 		return pWin;
 	}
 private:	//
-xnode	m_agentNode;	//Agent Condition
+	xnode	m_agentNode;	//Agent Condition
 	xstring	m_agentCond;	//Agent Node
+public:
 	int SetAgent()
 	{
 		xstring xfNodeAgentArea = L"agentarea";
@@ -86,7 +88,7 @@
 			xml x;
 			if (!x.loadXML(content))
 			{
-				KXMLDOMParseError pError = x.parseError;
+				KXMLDOMParseError pError = x.parseError();
 				if (pError)
 				{
 					xstring str = pError.srcText();
@@ -111,8 +113,8 @@
 			xstring sType = OnGetType();
 			if (sType == L"xml.xsd")
 			{
-				xstring sError;
-				x.ValidSchema(content, &sError);
+				BSTR sError;
+				x.ValidSchema((const wchar_t*)content.c_str(), sError);
 				trace(sError);
 			}
 			xutil::RestoreCursor(hCursor);
@@ -142,6 +144,8 @@
 		AttachEvent(L"WM_XCOMMAND",(FEvent)&XDevEditXDV::OnXCommand);
 		//获取焦点事件,用于重置工具条
 		AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditXDV::OnSetFocus);
+
+		return 1;
 	}
 
 	/*

--
Gitblit v1.9.3