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/XDevEditXML.cpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/jrj/xframe/devloper/XDevEditXML.cpp b/jrj/xframe/devloper/XDevEditXML.cpp
index 1467847..4c0bdae 100644
--- a/jrj/xframe/devloper/XDevEditXML.cpp
+++ b/jrj/xframe/devloper/XDevEditXML.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 XDevEditXML : public xwin
+class export XDevEditXML : public XDevEditPage
{
public:
- XDevEditXML(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+ XDevEditXML(void* implPtr, HWND hWnd) :XDevEditPage(implPtr, hWnd) {}
public:
static XDevEditXML* CreateInstance(void* implPtr, void* hWnd)
{
@@ -129,8 +130,8 @@
xstring sType = OnGetType();
if (sType == L"xml.xsd")
{
- xstring sError;
- x.ValidSchema(content, &sError);
+ BSTR sError;
+ x.ValidSchema(content.c_str(), sError);
trace(sError);
}
}
@@ -227,6 +228,8 @@
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditXML::OnSetFocus);
//AttachEvent(L"content",L"WM_LBUTTONDOWN", ,(FEvent)&XDevEditXML::OnLButtonDown);
+
+ return 1;
}
int OnInitial()
--
Gitblit v1.9.3