From ab9cc7af0099039900e46613ed862ccecf482b00 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 25 七月 2024 15:30:19 +0800
Subject: [PATCH] update accepttext
---
jrj/xframe/kobject/kdwgrid.hpp | 2 +-
jrj/xframe/kobject/kcontrol.hpp | 4 ++--
jrj/xframe/kobject/kdwtable.hpp | 2 +-
jrj/xframe/xcontrol/xdwgrid.hpp | 2 +-
jrj/xframe/xcontrol/xdwtable.hpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/kobject/kcontrol.hpp b/jrj/xframe/kobject/kcontrol.hpp
index 28398a0..0001aa3 100644
--- a/jrj/xframe/kobject/kcontrol.hpp
+++ b/jrj/xframe/kobject/kcontrol.hpp
@@ -26,8 +26,8 @@
public:
int Redraw();
public:
- int DoAcceptText();
- int AcceptText() { return 1;}
+ //int DoAcceptText();
+ //int AcceptText() { return 1;}
public:
int SetStyle(DWORD dwStyle);
int SetStyleEx(DWORD dwStyleEx);
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);
diff --git a/jrj/xframe/kobject/kdwtable.hpp b/jrj/xframe/kobject/kdwtable.hpp
index 4783f3a..8e220a0 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();
+ 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 0781f6f..ae30a2b 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -261,7 +261,7 @@
}
int AcceptText()
{
- return getKReport()->AcceptText();
+ return getKReport()->AcceptText_();
}
int ShowRowTo(int row)
{
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index 608b3a4..05f76fc 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -401,7 +401,7 @@
public:
int AcceptText()
{
- return GetDwTable()->AcceptText();
+ return GetDwTable()->AcceptText_();
}
int getNullCell(POINT& p)
{
--
Gitblit v1.9.3