From d8ccb3822dcf4b507b121b97c297e7ee6d09d2d6 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 09 七月 2024 13:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/wobject/xcontrol.hpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/wobject/xcontrol.hpp b/jrj/xframe/wobject/xcontrol.hpp
index 04dd7fe..4bd5f02 100644
--- a/jrj/xframe/wobject/xcontrol.hpp
+++ b/jrj/xframe/wobject/xcontrol.hpp
@@ -24,8 +24,8 @@
int SetReadOnlyEx(const bool )
{
- int EM_SETREADONLY = 0x00CF;
- return SendMessage(GetHWND(),EM_SETREADONLY,0,0);
+ int EM_SETREADONLY_ = 0x00CF;
+ return SendMessage(GetHWND(),EM_SETREADONLY_,0,0);
}
int EnableWindow(bool abled)
@@ -35,24 +35,25 @@
int GetTextLength()
{
- int WM_GETTEXTLENGTH = 0x000E;
+ int WM_GETTEXTLENGTH_ = 0x000E;
int nLen = ::GetWindowTextLengthW(GetHWND());
return nLen;
}
xstring GetText()
{
- int WM_GETTEXT = 0x000D;
+ int WM_GETTEXT_ = 0x000D;
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;
}
int SetText(string value)
{
- int WM_SETTEXT = 0x000C;
+ int WM_SETTEXT_ = 0x000C;
::SetWindowTextW(GetHWND(),value);
return 1;
}
--
Gitblit v1.9.3