From b2382ac77e296cfed7accce9d1d287a5d722c03b Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 31 十月 2024 09:27:44 +0800
Subject: [PATCH] update

---
 jrj/project/business/Affair/Business5.cpp |    2 +-
 jrj/project/vindexform.cpp                |    4 ++--
 jrj/xframe/xcontrol/xdwgrid.hpp           |   14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jrj/project/business/Affair/Business5.cpp b/jrj/project/business/Affair/Business5.cpp
index 34f9a1d..b6c1392 100644
--- a/jrj/project/business/Affair/Business5.cpp
+++ b/jrj/project/business/Affair/Business5.cpp
@@ -410,7 +410,7 @@
 				
 			trace(ele.xml());
 			arg.AddArg(L"content",ele.xml());
-			xml doc=new xml;			
+			xml doc;			
 			if(getUrl(L"/sale/data/vpage/vstart/task",arg.GetString(),doc)!=1)
 			{
 				trace((xstring)L"error->:"+doc.xml());
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 05a22a6..58821fc 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -676,8 +676,8 @@
 	{
 		ReSetInfo();
 		//OpenWindow("dev:xpage[start.vframe.vbusiness.vx]");
-		xwin* lw_face = OpenWindow(L"dev:xpage[start.vframe.vbusiness.vx]");
-		//xwin* lw_face = OpenWindow(L"dev:xpage[Business5.vx]");
+		//xwin* lw_face = OpenWindow(L"dev:xpage[start.vframe.vbusiness.vx]");
+		xwin* lw_face = OpenWindow(L"dev:xpage[Business5.vx]");
 		if(lw_face)m_startwin = lw_face->GetHWND();
 		cbx_panelName.SetCurSel( -1);
 		ResetMenu();
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index ae30a2b..f2c0d3b 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -28,7 +28,7 @@
 	int SetRow(int row) { return getKReport()->SetRow_(row); }
 public:
 	int GetColumnCount() { return getKReport()->GetColumnCount_(); }
-	LPCTSTR GetColumnName(int col) { return getKReport()->GetColumnName_(col); }
+	xstring GetColumnName(int col) { return getKReport()->GetColumnName_(col); }
 	int GetColumnIndex(LPCTSTR pColumn) { return getKReport()->GetColumnIndex_(pColumn); }
 public:
 	xstring GetItemString(int nRow, int nColumn, kdwgrid::DWBuffer dwBuffer = kdwgrid::dbuf_normal)
@@ -212,22 +212,22 @@
 		return getKReport()->AllowSort(sort);
 	}
 public:
-	int FindByColumn(int startRow, int columnIndex, LPCTSTR columnValue)
+	int FindByColumn(int startRow, int columnIndex, xstring columnValue)
 	{
-		return getKReport()->FindByColumn(startRow, columnIndex, columnValue);
+		return getKReport()->FindByColumn(startRow, columnIndex, columnValue.c_str());
 	}
-	int FindByColumn(int startRow, LPCTSTR column, LPCTSTR columnValue)
+	int FindByColumn(int startRow, xstring column, xstring columnValue)
 	{
-		return getKReport()->FindByColumn(startRow,column,columnValue);
+		return getKReport()->FindByColumn(startRow,column.c_str(), columnValue.c_str());
 	}
 
 	int SetReadOnlyColumn(int columnIndex, bool flag = true)
 	{
 		return getKReport()->SetReadOnlyColumn(columnIndex, flag);
 	}
-	int SetReadOnlyColumn(LPCTSTR column, bool flag = true)
+	int SetReadOnlyColumn(xstring column, bool flag = true)
 	{
-		return getKReport()->SetReadOnlyColumn(column, flag);
+		return getKReport()->SetReadOnlyColumn(column.c_str(), flag);
 	}
 
 	int SetColumnWidth(int columnIndex, int width = 1)

--
Gitblit v1.9.3