From e5fffc735582cebd82a7aef302250c073acd8998 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 25 七月 2024 15:05:44 +0800
Subject: [PATCH] update accepttext
---
jrj/xframe/kobject/kdwgrid.hpp | 6 ++----
jrj/xframe/kobject/kdwtable.hpp | 2 +-
jrj/xframe/xcontrol/xdwgrid.hpp | 2 +-
jrj/xframe/xcontrol/xdwtable.hpp | 1 -
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/jrj/xframe/kobject/kdwgrid.hpp b/jrj/xframe/kobject/kdwgrid.hpp
index e983c66..e535293 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();
diff --git a/jrj/xframe/kobject/kdwtable.hpp b/jrj/xframe/kobject/kdwtable.hpp
index ad59526..4783f3a 100644
--- a/jrj/xframe/kobject/kdwtable.hpp
+++ b/jrj/xframe/kobject/kdwtable.hpp
@@ -214,7 +214,7 @@
void ClearOriginString(int nRow, int nCol);
void ClearAdvanceString(int nRow, int nCol);
public:
- int AcceptText() { return 1; }
+ int AcceptText();
int getNullCell(POINT& p);
int ExpandRow();
int ExpandRow(int sRow, int eRow);
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 68b214c..0781f6f 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -286,7 +286,7 @@
}
int Redraw()
{
- return getKReport()->RedrawEx();
+ return getKReport()->Redraw();
}
bool SetRowMove(int row, int movecount)
{
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 39a15b0..608b3a4 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -449,7 +449,6 @@
{
return GetDwTable()->SetRowSort(colName, colOrder);
}
-
public:
int GetItemInt(int row, int col)
{
--
Gitblit v1.9.3