From 4161b991dc09760ea8ed92ba840099f4102dc5e2 Mon Sep 17 00:00:00 2001
From: qianxj2004 <qianxj15@sina.com>
Date: 星期三, 22 十月 2025 16:53:14 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/ximageview.hpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jrj/xframe/xcontrol/ximageview.hpp b/jrj/xframe/xcontrol/ximageview.hpp
index df45f8e..4c0b4da 100644
--- a/jrj/xframe/xcontrol/ximageview.hpp
+++ b/jrj/xframe/xcontrol/ximageview.hpp
@@ -15,13 +15,13 @@
return (kimageview*)getNativePointer();
}
public:
- int AddImages(LPCTSTR pUrl, LPTSTR pText=NULL)
+ int AddImages(LPCTSTR pUrl, LPCTSTR pText=L"")
{
- return GetKImageView()->AddImages(pUrl, pText);
+ return GetKImageView()->AddImages(pUrl, (LPTSTR)pText);
}
- int InsertImages(LPCTSTR pUrl, LPTSTR pText, int nIndex)
+ int InsertImages(LPCTSTR pUrl, LPCTSTR pText, int nIndex)
{
- return GetKImageView()->InsertImages(pUrl, pText,nIndex);
+ return GetKImageView()->InsertImages(pUrl,(LPTSTR)pText,nIndex);
}
int RemoveImage(int nIndex)
{
--
Gitblit v1.9.3