From c53e143adac6686e96ee12517928db78f1a49067 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 17 十二月 2024 12:53:21 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/xframe/kobject/kdwgrid.hpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jrj/xframe/kobject/kdwgrid.hpp b/jrj/xframe/kobject/kdwgrid.hpp
index e535293..6f3877a 100644
--- a/jrj/xframe/kobject/kdwgrid.hpp
+++ b/jrj/xframe/kobject/kdwgrid.hpp
@@ -214,7 +214,7 @@
 		int SetColumnState(LPCTSTR column, bool state);
 
 		void SetDataToClip(LPCTSTR DataStr);
-		int AcceptText();
+		int AcceptText_();
 		int ShowRowTo(int row);
 		int GetShowRow();
 		LPCTSTR GetTitleName(int col);

--
Gitblit v1.9.3