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/XDevEditXPage.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/devloper/XDevEditXPage.cpp b/jrj/xframe/devloper/XDevEditXPage.cpp
index 0e63798..874d0f0 100644
--- a/jrj/xframe/devloper/XDevEditXPage.cpp
+++ b/jrj/xframe/devloper/XDevEditXPage.cpp
@@ -5,12 +5,13 @@
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xlayersheet.hpp>
#include <xcontrol/xsedit.hpp>
+#include "XDevEditPage.hpp"
using xml = KXMLDOMDocument;
-class export XDevEditXPage : public xwin
+class export XDevEditXPage : public XDevEditPage
{
public:
- XDevEditXPage(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd){}
+ XDevEditXPage(void* implPtr, HWND hWnd) :XDevEditPage(implPtr, hWnd){}
public:
static XDevEditXPage* CreateInstance(void* implPtr, void* hWnd)
{
@@ -87,6 +88,8 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&XDevEditXPage::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditXPage::OnSetFocus);
+
+ return 1;
}
int LoadData()
--
Gitblit v1.9.3