From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/wobject/xstring.hpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/wobject/xstring.hpp b/jrj/xframe/wobject/xstring.hpp
index 020ebfd..c65960c 100644
--- a/jrj/xframe/wobject/xstring.hpp
+++ b/jrj/xframe/wobject/xstring.hpp
@@ -17,12 +17,16 @@
xstring(int val);
xstring(double val);
- xstring(LPARAM val);
+ xstring(LPARAM val,bool bdata=false);
xstring(wchar_t* val, bool shouldSysFree = false);
xstring(const wchar_t* val, bool shouldSysFree = false);
~xstring();
public:
+ operator LPARAM()
+ {
+ return (LPARAM)data;
+ }
operator const wchar_t*()
{
return c_str();
@@ -87,7 +91,8 @@
xstring rtrim();
bool isNumber();
- xstring replace(wchar_t* from, wchar_t* to, int pos);
+ xstring replace(const wchar_t* from, const wchar_t* to);
+ xstring replace(const wchar_t* from, const wchar_t* to, int pos);
};
xstring operator +(const wchar_t* lhs, const xstring& rhs);
--
Gitblit v1.9.3