From 68d53805cead98b6fd18a05738af034020cad123 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 18 七月 2024 14:09:16 +0800
Subject: [PATCH] update new operator
---
jrj/project/business/BasicCode/FCL.cpp | 9 +---
jrj/project/business/BasicCode/brand.regtype.cpp | 6 +--
jrj/project/business/BasicCode/BrandInforMaint.cpp | 3 -
jrj/project/business/BasicCode/PaymentTerm.maint.cpp | 3 -
jrj/project/business/BasicCode/ForwarderMaint.cpp | 51 ++++++++-----------------
jrj/project/business/BasicCode/ExpressMaint.cpp | 39 ++++++-------------
jrj/project/business/BasicCode/QuickCode.cpp | 3 -
jrj/project/business/BasicCode/CustomerMarketMaint.cpp | 3 -
8 files changed, 39 insertions(+), 78 deletions(-)
diff --git a/jrj/project/business/BasicCode/BrandInforMaint.cpp b/jrj/project/business/BasicCode/BrandInforMaint.cpp
index 85bd9f6..7c6eb39 100644
--- a/jrj/project/business/BasicCode/BrandInforMaint.cpp
+++ b/jrj/project/business/BasicCode/BrandInforMaint.cpp
@@ -49,8 +49,7 @@
int onload()
{
maint::onload();
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
dw_base.SetColHeaderHeight(0);
dw_base.SetRowSelectorWidth(0);
diff --git a/jrj/project/business/BasicCode/CustomerMarketMaint.cpp b/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
index 852cbc7..5a078b0 100644
--- a/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
+++ b/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
@@ -50,8 +50,7 @@
int onload()
{
maint::onload();
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
if (!maint::m_EntityID)
{
//xstring suserid = publiccode::GetUser().id;
diff --git a/jrj/project/business/BasicCode/ExpressMaint.cpp b/jrj/project/business/BasicCode/ExpressMaint.cpp
index 59bc7d6..3e2dbd6 100644
--- a/jrj/project/business/BasicCode/ExpressMaint.cpp
+++ b/jrj/project/business/BasicCode/ExpressMaint.cpp
@@ -47,8 +47,7 @@
//trace(1);
m_userid = publiccode::GetUser().id;
m_username = publiccode::GetUser().name;
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
dw_base.SetItemString(1, L"PartyID", GetGuid());
dw_base.SetItemString(1, L"PStatus", L"1");
dw_base.SetItemDisplayString(1, L"PStatus", L"有效");
@@ -75,10 +74,8 @@
}
int OnAddrow()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ dw_base = GetControl(L"dw_base");
+ xdwtable dw =dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -91,10 +88,8 @@
}
int OnInsertRow()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ dw_base =GetControl(L"dw_base");
+ xdwtable dw = dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -109,10 +104,8 @@
int OnDeleteRow()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ dw_base = GetControl(L"dw_base");
+ xdwtable dw = dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -162,15 +155,13 @@
int OnPreSave()
{
dw_base.AcceptText();
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
xstring ExpressNo = dw_base.GetItemString(1, L"ExpressNo");
if (ExpressNo == L"")
{
dw_base.SetItemString(1, L"ExpressNo", getGoodsNo());
}
- xdwtable dwcon = new xdwtable;
- dwcon.setNativePointer(dw_base.FindDwTable(L"item", 0));
+ xdwtable dwcon = dw_base.FindDwTable(L"item", 0);
int i;
for (i = 1; i <= dwcon.GetRowCount(); i++)
{
@@ -199,8 +190,7 @@
}
}
- xdwtable dwcon1 = new xdwtable;
- dwcon1.setNativePointer(dw_base.FindDwTable(L"PartyBankAccount", 0));
+ xdwtable dwcon1 = dw_base.FindDwTable(L"PartyBankAccount", 0);
int j;
xstring sPBABankName = L"";
xstring sPBABankAccountNo = L"";
@@ -228,8 +218,7 @@
}
int OnSave()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
xstring SName = dw_base.GetItemString(1, L"Name");
if (SName == L"") {
alert(L"请输入快递公司名称！");
@@ -292,8 +281,7 @@
}
int OnCellChanged(TEvent* evt, LPARAM p)
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
xstring colname = hdr.colname;
//trace(colname);
@@ -328,8 +316,7 @@
int onload()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
OnAttachEvent();
//if(!m_configDoc) return -1;
diff --git a/jrj/project/business/BasicCode/FCL.cpp b/jrj/project/business/BasicCode/FCL.cpp
index afa9bc1..a1ae4e1 100644
--- a/jrj/project/business/BasicCode/FCL.cpp
+++ b/jrj/project/business/BasicCode/FCL.cpp
@@ -55,8 +55,7 @@
{
xaserverarg arg;
- xdwpages zz = new xdwpages;
- zz.setNativePointer(GetControl(L"pages"));
+ xdwpages zz = GetControl(L"pages");
xml x;
getUrl(L"/sale/data/FCL/entity/list", arg.GetString(), x);
@@ -321,11 +320,9 @@
}
int OnInit()
{
- dw_list = new xdwgrid;
- dw_list.setNativePointer(GetControl(L"dw_list"));
+ dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/FCL/template/FCL/List");
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
dw_base.openUrl(L"/sale/view/FCL/template/FCL/pricebase");
dw_list.SetReadOnlyColumn(L"shipthread", true);
dw_list.SetReadOnlyColumn(L"price20", true);
diff --git a/jrj/project/business/BasicCode/ForwarderMaint.cpp b/jrj/project/business/BasicCode/ForwarderMaint.cpp
index 53e1d61..87c47c0 100644
--- a/jrj/project/business/BasicCode/ForwarderMaint.cpp
+++ b/jrj/project/business/BasicCode/ForwarderMaint.cpp
@@ -32,10 +32,8 @@
int setCellReadOnly()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- dw_cell = new xcell;
- dw_cell.setNativePointer(dw_base.QueryItem(L"ixcell"));
+ dw_base =GetControl(L"dw_base");
+ dw_cell = dw_base.QueryItem(L"ixcell");
xstring strnew = L"<cellprop celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='保护' cellvisibleex='' cellvisible='' cellvalid='' cellinitial=''/>";
//dw_cell.SetCellProps(2,2,strnew);
return 0;
@@ -48,8 +46,7 @@
if (m_EntityID == L"") {
m_userid = publiccode::GetUser().id;
m_username = publiccode::GetUser().name;
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
dw_base.SetItemString(1, L"ForwarderID", GetGuid());
dw_base.SetItemString(1, L"PartyID", GetGuid());
dw_base.SetItemString(1, L"PStatus", L"1");
@@ -94,10 +91,8 @@
int OnAddrow()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ dw_base = GetControl(L"dw_base");
+ xdwtable dw = dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -109,10 +104,8 @@
}
int OnInsertRow()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ dw_base = GetControl(L"dw_base");
+ xdwtable dw = dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -128,8 +121,7 @@
{
dw_base = new xdwtable;
dw_base.setNativePointer(GetControl(L"dw_base"));
- xdwtable dw = new xdwtable;
- dw.setNativePointer(dw_base.GetCurTable());
+ xdwtable dw = dw_base.GetCurTable();
xstring dw_n = dw.GetDwName();
if (dw_n == L"item")
{
@@ -179,15 +171,13 @@
int OnPreSave()
{
dw_base.AcceptText();
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
xstring ForwarderNo = dw_base.GetItemString(1, L"ForwarderNo");
if (ForwarderNo == L"")
{
dw_base.SetItemString(1, L"ForwarderNo", getGoodsNo());
}
- xdwtable dwcon = new xdwtable;
- dwcon.setNativePointer(dw_base.FindDwTable(L"item", 0));
+ xdwtable dwcon =dw_base.FindDwTable(L"item", 0);
int i;
for (i = 1; i <= dwcon.GetRowCount(); i++)
{
@@ -214,8 +204,7 @@
}
}
}
- xdwtable dwcon2 = new xdwtable;
- dwcon2.setNativePointer(dw_base.FindDwTable(L"item2", 0));
+ xdwtable dwcon2 = dw_base.FindDwTable(L"item2", 0);
int k;
xstring sPBABankName2 = L"";
xstring sPBABankAccountNo2 = L"";
@@ -248,8 +237,7 @@
}
}
}
- xdwtable dwcon1 = new xdwtable;
- dwcon1.setNativePointer(dw_base.FindDwTable(L"item1", 0));
+ xdwtable dwcon1 = dw_base.FindDwTable(L"item1", 0);
int j;
xstring sPBABankName1 = L"";
xstring sPBABankAccountNo1 = L"";
@@ -284,8 +272,7 @@
}
int OnPostSave()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
xaserverarg args;
xml x;
@@ -332,8 +319,7 @@
}
int OnSave()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
xstring SName = dw_base.GetItemString(1, L"Name");
if (SName == L"") {
alert(L"请输入货代名称！");
@@ -396,8 +382,7 @@
}
int OnCellChanged(TEvent* evt, LPARAM p)
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
xstring colname = hdr.colname;
xstring coldata = hdr.data;
@@ -426,8 +411,7 @@
else if (colname == L"PPrimaryFlag" && coldata == L"Y")
{
xdwtable dw_pc;
- dw_pc = new xdwtable;
- dw_pc.setNativePointer(dw_base.FindDwTable(L"item"));
+ dw_pc = dw_base.FindDwTable(L"item");
if (dw_pc)
{
int i;
@@ -449,8 +433,7 @@
}
int onload()
{
- dw_base = new xdwtable;
- dw_base.setNativePointer(GetControl(L"dw_base"));
+ dw_base = GetControl(L"dw_base");
OnAttachEvent();
//if(!m_configDoc) return -1;
diff --git a/jrj/project/business/BasicCode/PaymentTerm.maint.cpp b/jrj/project/business/BasicCode/PaymentTerm.maint.cpp
index c54e92e..fa51030 100644
--- a/jrj/project/business/BasicCode/PaymentTerm.maint.cpp
+++ b/jrj/project/business/BasicCode/PaymentTerm.maint.cpp
@@ -409,8 +409,7 @@
//maint::onload();
//maint::onloaded();
dw_base = GetControl(L"dw_base");
- dw_cell = new xcell;
- dw_cell.setNativePointer(dw_base.QueryItem(L"ixcell"));
+ dw_cell = dw_base.QueryItem(L"ixcell");
dw_base.openUrl(L"/sale/view/Payment/template/Payment/maint");
//alert(L"1233");
OnRetrieve();
diff --git a/jrj/project/business/BasicCode/QuickCode.cpp b/jrj/project/business/BasicCode/QuickCode.cpp
index 1fd2885..bc02e91 100644
--- a/jrj/project/business/BasicCode/QuickCode.cpp
+++ b/jrj/project/business/BasicCode/QuickCode.cpp
@@ -468,8 +468,7 @@
}
m_dbmap = dbmap;
- dw_list = new xdwgrid;
- dw_list.setNativePointer(GetControl(dwname));
+ dw_list = GetControl(dwname);
dw_list.openUrl(vface + L"/" + tpl);
//dw_list.SetSelectionMode(4);
return 1;
diff --git a/jrj/project/business/BasicCode/brand.regtype.cpp b/jrj/project/business/BasicCode/brand.regtype.cpp
index d58a1c3..bdf4736 100644
--- a/jrj/project/business/BasicCode/brand.regtype.cpp
+++ b/jrj/project/business/BasicCode/brand.regtype.cpp
@@ -44,8 +44,7 @@
xdwtable getDw()
{
- xdwtable dw1 = new xdwtable;
- dw1.setNativePointer(dw_list.FindDwTable(L"item"));
+ xdwtable dw1 = dw_list.FindDwTable(L"item");
return dw1;
}
@@ -147,8 +146,7 @@
int onload()
{
- dw_list = new xdwtable;
- dw_list.setNativePointer(GetControl(L"dw_list"));
+ dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/brand/template/regtype");
//dw_list.SetColHeaderHeight(0);
dw_list.SetRowSelectorWidth(0);
--
Gitblit v1.9.3