From 7f45e69221d65ec15b0684680c85fb7ed28169f3 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 08 七月 2024 17:09:04 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Public/search.dialog.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/Public/search.dialog.cpp b/jrj/project/business/Public/search.dialog.cpp
index 056c4ad..22d796e 100644
--- a/jrj/project/business/Public/search.dialog.cpp
+++ b/jrj/project/business/Public/search.dialog.cpp
@@ -54,7 +54,7 @@
 			if (GetWinParam())
 			{
 				xaserverarg arg = GetArg();
-				arg.AddArg(L"text", GetControl(L"sl_search").GetText());
+				arg.AddArg(L"text", xcontrol(GetControl(L"sl_search")).GetText());
 				CloseWindow();
 			}
 			return 1;
@@ -84,10 +84,12 @@
 			AttachEvent(L"WM_XCOMMAND", (FEvent)&SearchDlg::OnXCommand);
 			//获取焦点事件,用于重置工具条
 			AttachEvent(L"WM_SETFOCUS", (FEvent)&SearchDlg::OnSetFocus);
+			return 1;
 		}
 
 		int onload()
 		{
+			SetArg();
 			sle_1 = GetControl(L"sl_search");
 			int x = GetWindowLong(GetHWND(), -16); //GWL_STYLE
 			x = x + 0x0008;
@@ -97,7 +99,7 @@
 			if (GetWinParam())
 			{
 				xaserverarg arg = GetArg();
-				GetControl(L"sl_search").SetText(arg.GetArgString(L"text"));
+				xcontrol(GetControl(L"sl_search")).SetText(arg.GetArgString(L"text"));
 			}
 
 			return 1;

--
Gitblit v1.9.3