From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/xframe/kobject/kutil.hpp |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/jrj/xframe/kobject/kutil.hpp b/jrj/xframe/kobject/kutil.hpp
index d35c695..7df58f2 100644
--- a/jrj/xframe/kobject/kutil.hpp
+++ b/jrj/xframe/kobject/kutil.hpp
@@ -1,9 +1,11 @@
 #pragma once
 #include "kbase.hpp"
 
-
+#ifdef _XWIN
 typedef struct HICON__{}*HICON;
 typedef HICON HCURSOR;
+#endif
+
 namespace Hxsoft{ namespace XFrame
 {
 	class IXFUtil
@@ -28,4 +30,9 @@
 
 namespace Hxsoft { namespace XUtil{
 	LPTSTR FormatDecimalString(LPTSTR  str, LPTSTR format, bool& bfree);
+	LPTSTR ToXmlTextAndStartSpace(LPCTSTR str);
+	LPTSTR ToHtmlTextAndStartSpace(LPCTSTR str);
+	LPTSTR ToXmlText(LPCTSTR str);
+	LPTSTR ToHtmlText(LPCTSTR str);
+	LPTSTR UnXMLText(LPCTSTR str);
 }}
\ No newline at end of file

--
Gitblit v1.9.3