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/XDevEditXDV.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/jrj/xframe/devloper/XDevEditXDV.cpp b/jrj/xframe/devloper/XDevEditXDV.cpp
index 621b492..73adc40 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)
{
@@ -86,7 +87,7 @@
xml x;
if (!x.loadXML(content))
{
- KXMLDOMParseError pError = x.parseError;
+ KXMLDOMParseError pError = x.parseError();
if (pError)
{
xstring str = pError.srcText();
@@ -111,8 +112,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 +143,8 @@
AttachEvent(L"WM_XCOMMAND",(FEvent)&XDevEditXDV::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditXDV::OnSetFocus);
+
+ return 1;
}
/*
--
Gitblit v1.9.3