From 9878a1476ea2b70116a770a65104104fb16841b5 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 03 七月 2024 23:12:38 +0800
Subject: [PATCH] check
---
jrj/xframe/wobject/xcontrol.hpp | 3 ++-
jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp | 2 +-
jrj/xframe/xcontrol/ximageview.hpp | 2 +-
jrj/project/business/PO/business4.cpp | 0
jrj/project/workflow/workflow.chkdlg_vd.cpp | 2 +-
jrj/xframe/wobject/xaserverarg.hpp | 4 ++--
jrj/project/workflow/workflow.chkdlg.cpp | 2 +-
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/jrj/project/business/PO/business4.cpp b/jrj/project/business/PO/business4.cpp
index dedcfbd..4c01438 100644
--- a/jrj/project/business/PO/business4.cpp
+++ b/jrj/project/business/PO/business4.cpp
Binary files differ
diff --git a/jrj/project/workflow/workflow.chkdlg.cpp b/jrj/project/workflow/workflow.chkdlg.cpp
index 145cdda..e500ef2 100644
--- a/jrj/project/workflow/workflow.chkdlg.cpp
+++ b/jrj/project/workflow/workflow.chkdlg.cpp
@@ -16,7 +16,7 @@
public:
//命令发布函数
- int OnCmdDispatch(string comdid)
+ int OnCmdDispatch(xstring comdid)
{
if (GetWinParam())
{
diff --git a/jrj/project/workflow/workflow.chkdlg_vd.cpp b/jrj/project/workflow/workflow.chkdlg_vd.cpp
index 8e86760..b6cad36 100644
--- a/jrj/project/workflow/workflow.chkdlg_vd.cpp
+++ b/jrj/project/workflow/workflow.chkdlg_vd.cpp
@@ -16,7 +16,7 @@
public:
//命令发布函数
- int OnCmdDispatch(string comdid)
+ int OnCmdDispatch(xstring comdid)
{
if (GetWinParam())
{
diff --git a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
index dc9398a..e2d61f9 100644
--- a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
@@ -126,7 +126,7 @@
xstring comdid = arg.GetArgString(L"comdid");
if (comdid ==L"xmOK")
{
- string value = arg.GetArgString(L"content");
+ xstring value = arg.GetArgString(L"content");
return value;
}
return L"";
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index d7a6fdf..228c87a 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/jrj/xframe/wobject/xaserverarg.hpp
@@ -109,7 +109,7 @@
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetArg(argname,val,typ);
}
- string GetString() //alias "?GetString@IXAServerArg@XFrame@Hxsoft@@QAEPB_WXZ" from "xframe.dll";
+ xstring GetString() //alias "?GetString@IXAServerArg@XFrame@Hxsoft@@QAEPB_WXZ" from "xframe.dll";
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetString();
}
@@ -134,7 +134,7 @@
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetArgInt((LPTSTR)argname);
}
- string GetArgString(string argname) //alias "?GetArgString@IXAServerArg@XFrame@Hxsoft@@QAEPA_WPA_W@Z";
+ xstring GetArgString(string argname) //alias "?GetArgString@IXAServerArg@XFrame@Hxsoft@@QAEPA_WPA_W@Z";
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetArgString((LPTSTR)argname);
}
diff --git a/jrj/xframe/wobject/xcontrol.hpp b/jrj/xframe/wobject/xcontrol.hpp
index c001204..4bd5f02 100644
--- a/jrj/xframe/wobject/xcontrol.hpp
+++ b/jrj/xframe/wobject/xcontrol.hpp
@@ -46,7 +46,8 @@
int nLen = GetTextLength();
xstring xs;
- GetWindowTextW(GetHWND(),xs.sure(nLen+1),nLen + 1);
+ wchar_t* buf = xs.sure(nLen + 1);
+ GetWindowTextW(GetHWND(),buf , nLen + 1);
return xs;
}
diff --git a/jrj/xframe/xcontrol/ximageview.hpp b/jrj/xframe/xcontrol/ximageview.hpp
index 7fa1841..4c0b4da 100644
--- a/jrj/xframe/xcontrol/ximageview.hpp
+++ b/jrj/xframe/xcontrol/ximageview.hpp
@@ -15,7 +15,7 @@
return (kimageview*)getNativePointer();
}
public:
- int AddImages(LPCTSTR pUrl, LPCTSTR pText=NULL)
+ int AddImages(LPCTSTR pUrl, LPCTSTR pText=L"")
{
return GetKImageView()->AddImages(pUrl, (LPTSTR)pText);
}
--
Gitblit v1.9.3