From 4e06e34c0a39cf7e45caca4fbc282bcffd31f30a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 22 七月 2024 23:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/total3/ViewTotalWin.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/jrj/project/total3/ViewTotalWin.cpp b/jrj/project/total3/ViewTotalWin.cpp
index e8e4699..b5613e5 100644
--- a/jrj/project/total3/ViewTotalWin.cpp
+++ b/jrj/project/total3/ViewTotalWin.cpp
@@ -15,11 +15,12 @@
{
public:
ViewTotalWin(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+public:
static ViewTotalWin* CreateInstance(void* implPtr, void* hWnd)
{
return new ViewTotalWin(implPtr, (HWND)hWnd);
}
-
+public:
xdwgrid dw_list;
xoffice dw_office;
xcell dw_cell;
@@ -135,7 +136,7 @@
if (argUrl != L"")
{
xaserverarg ar ;
- ar.setNativePointer(ar.CreateInstance());
+ //ar.setNativePointer(ar.CreateInstance());
ar.AddArg(L"argurl", argUrl);
if (argStr != L"")
ar.AddArg(L"arg", argStr);
@@ -494,7 +495,7 @@
{
KXMLDOMElement rpt = nlist.item(i);
xstring name = rpt.getAttribute(L"name");
- xc.AddItem( name, rpt);
+ xc.AddItem( name, rpt.ptr());
if (i == 0) xc.SetText(name);
if (i == 0) rptEle = rpt;
}
--
Gitblit v1.9.3