From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期三, 21 八月 2024 14:35:51 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/xframe/xcontrol/ximageview.hpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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