From 9c190b7a9a845bcb35d3d09d255f12d9c879e403 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期三, 23 十月 2024 18:07:50 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/xframe/kobject/kdwgrid.hpp | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jrj/xframe/kobject/kdwgrid.hpp b/jrj/xframe/kobject/kdwgrid.hpp index e983c66..6f3877a 100644 --- a/jrj/xframe/kobject/kdwgrid.hpp +++ b/jrj/xframe/kobject/kdwgrid.hpp @@ -214,16 +214,14 @@ int SetColumnState(LPCTSTR column, bool state); void SetDataToClip(LPCTSTR DataStr); - int AcceptText() { - return 1; - }; + int AcceptText_(); int ShowRowTo(int row); int GetShowRow(); LPCTSTR GetTitleName(int col); public: int SetRowSort(LPTSTR colName, bool colOrder = true); int SetClickEditFlag(bool f); - int RedrawEx(); + int Redraw(); bool SetRowMove(int row, int movecount); int GetTreeRow(int row); int GetTreeRowCount(); -- Gitblit v1.9.3